Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
13ea3632e3 | ||
|
|
465e5a4268 | ||
|
|
eeaa64a8e7 | ||
|
|
3a1cee61b8 | ||
|
|
21dd880e37 | ||
|
|
218972ed5d | ||
|
|
451b3638bf | ||
|
|
3acbaf576d | ||
|
|
eaec599109 | ||
|
|
c6c1efddae | ||
|
|
ae352ff244 | ||
|
|
dde8d76772 | ||
|
|
34a4bd93bd | ||
|
|
7154f206b4 | ||
|
|
19a2d10a2f | ||
|
|
da699403df | ||
|
|
1496bc66ad | ||
|
|
debe48f2b4 | ||
|
|
4bada614b9 | ||
|
|
537bfe824b | ||
|
|
a25ec99cb1 | ||
|
|
8ac5bfdfed | ||
|
|
618a62affe | ||
|
|
1ce934fd54 | ||
|
|
ab8ecfeefb | ||
|
|
a32e365d86 | ||
|
|
04f3e6194f | ||
|
|
0b183353d3 | ||
|
|
0c9b0ec6e6 | ||
|
|
5bef962977 | ||
|
|
029df7932e | ||
|
|
6be6005531 | ||
|
|
326775848b | ||
|
|
736a6053ef | ||
|
|
f4a41331b1 | ||
|
|
15c97b81b4 | ||
|
|
0fc3ea6146 | ||
|
|
596c3363e7 | ||
|
|
529b5599e4 | ||
|
|
184d8a8584 | ||
|
|
f6ca454999 | ||
|
|
cdc5aa16b0 | ||
|
|
7b816c3fbf | ||
|
|
0cecae5faa | ||
|
|
c17783064c | ||
|
|
d824a93695 | ||
|
|
5207c48f8d | ||
|
|
b30f4ed59a | ||
|
|
e3a816f2c8 | ||
|
|
240f8faef7 | ||
|
|
651ba865b1 | ||
|
|
a3e9d19c45 | ||
|
|
942867d646 | ||
|
|
041c2f02d5 | ||
|
|
fb30d577aa | ||
|
|
c4a90fcd1c | ||
|
|
4c3b34195a | ||
|
|
78494ee74d | ||
|
|
d3fff074e5 | ||
|
|
0ee0a06737 | ||
|
|
61000f2ff1 | ||
|
|
ac1ee86cc7 | ||
|
|
c934a4afcb | ||
|
|
359958aada | ||
|
|
7a73af4434 | ||
|
|
55bb941399 | ||
|
|
afb765024d | ||
|
|
911f867518 | ||
|
|
25bb19dbe5 | ||
|
|
9960ce2909 | ||
|
|
c2fde70954 | ||
|
|
5ca9c4a361 | ||
|
|
c27f2d13f0 | ||
|
|
26c81effd6 | ||
|
|
e72c83b980 | ||
|
|
e222c42150 | ||
|
|
e7b88fc6f6 | ||
|
|
079f353dbf | ||
|
|
e6e51be5a5 | ||
|
|
3a6b21a117 | ||
|
|
f42df5a70f | ||
|
|
0c3e9b5ace | ||
|
|
bc773154c6 | ||
|
|
a530e5e6e0 | ||
|
|
1ad87c205d | ||
|
|
d45f72b168 | ||
|
|
0c7db09c32 | ||
|
|
2b1648eff2 | ||
|
|
06356b46e9 | ||
|
|
21fe64f4bf | ||
|
|
e22f64dd51 | ||
|
|
f1b24ec783 | ||
|
|
8a90b56ac3 | ||
|
|
7d111c853b | ||
|
|
0c72481729 | ||
|
|
996626f9af | ||
|
|
878035e748 | ||
|
|
cc930ee4ac | ||
|
|
169a2e9059 |
No files matched your search
@@ -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
|
||||||
@@ -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 .
|
||||||
@@ -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:
|
||||||
|
|||||||
@@ -100,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 .
|
||||||
+36
-5
@@ -1,6 +1,39 @@
|
|||||||
# Changelog
|
# Changelog 
|
||||||
|
|
||||||
## [0.1.14] - Material UI + Autocomplete v2
|
## [0.1.22] - Many Visual improvements
|
||||||
|
|
||||||
|
- Deprecated several custom components in favor of mui.com
|
||||||
|
- Device Editor now has support for 99% of diplay types
|
||||||
|
- Condition Device is implemented
|
||||||
|
- Improved naming autogen for trigger & choose
|
||||||
|
|
||||||
|
## [0.1.21] - Service Editor
|
||||||
|
|
||||||
|
- first version of service editor
|
||||||
|
- reloading automations on save
|
||||||
|
|
||||||
|
## [0.1.20] - UI Bugfixes
|
||||||
|
|
||||||
|
- Using MUI elements for input time
|
||||||
|
- Added delay action / wait_on_triggers action
|
||||||
|
- Added enabled/disabled flag in node editor
|
||||||
|
- Optional flip vertical during desktop mode
|
||||||
|
- Fixed up modal clipping
|
||||||
|
|
||||||
|
## [0.1.19] - Vertical mobile mode
|
||||||
|
|
||||||
|
- in mobile mode we draw the graphs vertically now
|
||||||
|
|
||||||
|
## [0.1.17] - Websockets
|
||||||
|
|
||||||
|
- Connected to HA main websocket -- now we retrieve real-time information about
|
||||||
|
|
||||||
|
- Device names
|
||||||
|
- Entity names/ids
|
||||||
|
|
||||||
|
- Autocomplete for devices and entities
|
||||||
|
|
||||||
|
## [0.1.14] - Material UI + Autocomplete
|
||||||
|
|
||||||
- Brought some Material UI elements for input and text
|
- Brought some Material UI elements for input and text
|
||||||
- Autocomplete for tags
|
- Autocomplete for tags
|
||||||
@@ -20,7 +53,6 @@
|
|||||||
- Made the validators less strict in order to capture more edge cases that HA supports
|
- Made the validators less strict in order to capture more edge cases that HA supports
|
||||||
- Nicer auto-generated descriptions for some trigger nodes
|
- Nicer auto-generated descriptions for some trigger nodes
|
||||||
|
|
||||||
|
|
||||||
## [0.1.10] - More Bug Fixes
|
## [0.1.10] - More Bug Fixes
|
||||||
|
|
||||||
- Allowing null or undefined values for metadata fields
|
- Allowing null or undefined values for metadata fields
|
||||||
@@ -74,8 +106,7 @@
|
|||||||
## [0.0.9] - First Working Version
|
## [0.0.9] - First Working Version
|
||||||
|
|
||||||
- Instalable verion via github
|
- Instalable verion via github
|
||||||
- Initial POC done
|
- Initial POC done
|
||||||
|
|
||||||
|
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
+3
-4
@@ -9,7 +9,6 @@ WORKDIR /app
|
|||||||
ARG BUILD_VERSION
|
ARG BUILD_VERSION
|
||||||
|
|
||||||
# <--- Environment Variables -->
|
# <--- Environment Variables -->
|
||||||
ENV HASSIO_TOKEN ""
|
|
||||||
ENV BUILD_VERSION $BUILD_VERSION
|
ENV BUILD_VERSION $BUILD_VERSION
|
||||||
|
|
||||||
# <--- System Wide Dependencies -->
|
# <--- System Wide Dependencies -->
|
||||||
@@ -39,8 +38,6 @@ 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
|
|
||||||
|
|
||||||
# <--- Ports -->
|
# <--- Ports -->
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
@@ -50,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
|
||||||
@@ -1,10 +1,29 @@
|
|||||||
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
|
||||||
|
|
||||||
run:
|
build-no-cache:
|
||||||
$(MAKE) build
|
$(DC) build --no-cache
|
||||||
|
|
||||||
|
push:
|
||||||
|
$(DC) push
|
||||||
|
|
||||||
|
start:
|
||||||
$(DC) up -d
|
$(DC) up -d
|
||||||
sleep 1
|
sleep 1
|
||||||
$(DC) ps
|
$(DC) ps
|
||||||
@@ -18,3 +37,8 @@ ps:
|
|||||||
stop:
|
stop:
|
||||||
$(DC) stop
|
$(DC) stop
|
||||||
|
|
||||||
|
bash:
|
||||||
|
$(DC) exec addon bash
|
||||||
|
|
||||||
|
config:
|
||||||
|
$(DC) config
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
# Shortumation
|
# Shortumation 
|
||||||
|
|
||||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
||||||
|

|
||||||
|
| | Stable | Edge
|
||||||
|
| --- | --- | ---
|
||||||
|
| Version |  | 
|
||||||
|
|
||||||
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!
|
||||||
|
|
||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
+13
-16
@@ -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
@@ -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
@@ -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
|
||||||
@@ -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(),
|
||||||
|
|||||||
@@ -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(),
|
||||||
|
)
|
||||||
@@ -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="*")
|
||||||
@@ -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)
|
||||||
@@ -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())
|
||||||
@@ -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))
|
||||||
+5
-6
@@ -1,5 +1,5 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: v0.1.14
|
version: v0.1.22
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
image: asosnovsky/shortumation-{arch}
|
image: asosnovsky/shortumation-{arch}
|
||||||
url: "https://github.com/asosnovsky/Shortumation"
|
url: "https://github.com/asosnovsky/Shortumation"
|
||||||
@@ -16,12 +16,11 @@ 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: {}
|
||||||
|
|||||||
@@ -1,10 +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:-latest}
|
BUILD_VERSION: ${BUILD_TAG:-edge}
|
||||||
@@ -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
|
||||||
Executable
+10
@@ -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
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo $(python --version)
|
|
||||||
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
0:
|
0:
|
||||||
Type: Generic
|
Type: Generic2
|
||||||
1:
|
1:
|
||||||
Type: Generic
|
Type: Generic
|
||||||
2:
|
2:
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
SKIP_PREFLIGHT_CHECK=true
|
SKIP_PREFLIGHT_CHECK=true
|
||||||
@@ -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)"
|
||||||
|
|||||||
Vendored
+59
@@ -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
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
+26
-13
@@ -6,24 +6,32 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.9.0",
|
"@emotion/react": "^11.9.0",
|
||||||
"@emotion/styled": "^11.8.1",
|
"@emotion/styled": "^11.8.1",
|
||||||
|
"@mui/icons-material": "^5.8.3",
|
||||||
"@mui/material": "^5.8.0",
|
"@mui/material": "^5.8.0",
|
||||||
"@mui/styles": "^5.8.0",
|
"@mui/styles": "^5.8.0",
|
||||||
"@types/jest": "^26.0.15",
|
"@types/jest": "^27.5.1",
|
||||||
"@types/node": "^12.0.0",
|
"@types/node": "^17.0.36",
|
||||||
"@types/react": "^17.0.0",
|
"@types/react": "^18.0.9",
|
||||||
"@types/react-dom": "^17.0.0",
|
"@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": {
|
||||||
@@ -71,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
@@ -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>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -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 = {
|
||||||
|
|||||||
@@ -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))
|
||||||
|
|||||||
@@ -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;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { AutomationAPI } from './automations';
|
|||||||
|
|
||||||
|
|
||||||
export const useDefaultApiState = () => useState<ApiState>({
|
export const useDefaultApiState = () => useState<ApiState>({
|
||||||
automations: {ready: false},
|
automations: { ready: false },
|
||||||
});
|
});
|
||||||
|
|
||||||
export const makeReloadAutomations = (
|
export const makeReloadAutomations = (
|
||||||
@@ -21,8 +21,8 @@ export const makeReloadAutomations = (
|
|||||||
const resp = await automationAPI.list(params);
|
const resp = await automationAPI.list(params);
|
||||||
setState({
|
setState({
|
||||||
...state, automations: {
|
...state, automations: {
|
||||||
ready: true,
|
ready: true,
|
||||||
...resp,
|
...resp,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,11 @@ 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 { FC, useRef, useState } from 'react';
|
import { FC, ReactNode, useRef, useState } from "react";
|
||||||
import { AddIcon, TrashIcon } from "components/Icons";
|
import { AddIcon, TrashIcon } from "components/Icons";
|
||||||
import { Button } from "components/Inputs/Button";
|
|
||||||
import InputAutoText from "components/Inputs/InputAutoText";
|
import InputAutoText from "components/Inputs/InputAutoText";
|
||||||
import { TagDB } from "components/AutomationList/TagDB";
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
className: string;
|
className: string;
|
||||||
@@ -14,6 +14,7 @@ interface Props {
|
|||||||
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;
|
tagDB: TagDB;
|
||||||
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
export const AutoInfoBox: FC<Props> = ({
|
export const AutoInfoBox: FC<Props> = ({
|
||||||
metadata,
|
metadata,
|
||||||
@@ -24,122 +25,154 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
tagDB,
|
tagDB,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
|
const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
|
||||||
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
|
const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
|
||||||
|
-1,
|
||||||
|
"",
|
||||||
|
]);
|
||||||
const errorTimeoutId = useRef(-1);
|
const errorTimeoutId = useRef(-1);
|
||||||
|
|
||||||
// aliases
|
// aliases
|
||||||
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
|
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) {
|
||||||
window.clearTimeout(errorTimeoutId.current);
|
window.clearTimeout(errorTimeoutId.current);
|
||||||
}
|
}
|
||||||
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
|
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
|
||||||
}
|
};
|
||||||
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
|
const onUpdateMetadata =
|
||||||
...metadata,
|
<K extends keyof AutomationMetadata>(k: K) =>
|
||||||
[k]: update
|
(update: AutomationMetadata[K]) =>
|
||||||
}, tags);
|
onUpdate(
|
||||||
|
{
|
||||||
|
...metadata,
|
||||||
|
[k]: update,
|
||||||
|
},
|
||||||
|
tags
|
||||||
|
);
|
||||||
const validTagName = (newName: string): string | undefined => {
|
const validTagName = (newName: string): string | undefined => {
|
||||||
if (newName.length <= 0) {
|
if (newName.length <= 0) {
|
||||||
return "Name must be at least 1 character long"
|
return "Name must be at least 1 character long";
|
||||||
}
|
}
|
||||||
// eslint-disable-next-line
|
// eslint-disable-next-line
|
||||||
for (const [name, _] of tags) {
|
for (const [name, _] of tags) {
|
||||||
if (name.trim() === newName.trim()) {
|
if (name.trim() === newName.trim()) {
|
||||||
return `The tag '${name}' already exists`
|
return `The tag '${name}' already exists`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
const updateTagName = (newName: string, tagIndex: number) => {
|
const updateTagName = (newName: string, tagIndex: number) => {
|
||||||
const error = validTagName(newName);
|
const error = validTagName(newName);
|
||||||
if (error) {
|
if (error) {
|
||||||
return setError(tagIndex, error)
|
return setError(tagIndex, error);
|
||||||
}
|
}
|
||||||
onUpdate(metadata, [
|
onUpdate(metadata, [
|
||||||
...tags.slice(0, tagIndex),
|
...tags.slice(0, tagIndex),
|
||||||
[newName, tags[tagIndex][1]],
|
[newName, tags[tagIndex][1]],
|
||||||
...tags.slice(tagIndex + 1),
|
...tags.slice(tagIndex + 1),
|
||||||
])
|
]);
|
||||||
}
|
};
|
||||||
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
|
const onUpdateTags = (tagValue: string, tagIndex: number) =>
|
||||||
...tags.slice(0, tagIndex),
|
onUpdate(metadata, [
|
||||||
[tags[tagIndex][0], tagValue],
|
...tags.slice(0, tagIndex),
|
||||||
...tags.slice(tagIndex + 1),
|
[tags[tagIndex][0], tagValue],
|
||||||
])
|
...tags.slice(tagIndex + 1),
|
||||||
|
]);
|
||||||
const addNewTag = () => {
|
const addNewTag = () => {
|
||||||
const error = validTagName(newTag[0]);
|
const error = validTagName(newTag[0]);
|
||||||
if (error) {
|
if (error) {
|
||||||
return setError('new', error)
|
return setError("new", error);
|
||||||
}
|
}
|
||||||
onUpdate(metadata, tags.concat([
|
onUpdate(
|
||||||
newTag.map(x => x.trim()) as [string, string]
|
metadata,
|
||||||
]));
|
tags.concat([newTag.map((x) => x.trim()) as [string, string]])
|
||||||
setNewTag(['', '']);
|
);
|
||||||
}
|
setNewTag(["", ""]);
|
||||||
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
};
|
||||||
...tags.slice(0, tagIndex),
|
const onRemoveTag = (tagIndex: number) =>
|
||||||
...tags.slice(tagIndex + 1),
|
onUpdate(metadata, [
|
||||||
])
|
...tags.slice(0, tagIndex),
|
||||||
|
...tags.slice(tagIndex + 1),
|
||||||
|
]);
|
||||||
// render
|
// render
|
||||||
return <div className={`automation-editor--info-box ${className}`}>
|
return (
|
||||||
<div className="automation-editor--info-box-inner">
|
<div className={`automation-editor--info-box ${className}`}>
|
||||||
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
|
<div className="automation-editor--info-box-inner">
|
||||||
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
|
<InputText
|
||||||
<InputText multiline label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
|
label="ID"
|
||||||
<InputList
|
value={metadata.id}
|
||||||
label="Mode"
|
onChange={onUpdateMetadata("id")}
|
||||||
current={metadata.mode}
|
/>
|
||||||
onChange={onUpdateMetadata('mode')}
|
<InputText
|
||||||
options={[
|
label="Name"
|
||||||
'parallel',
|
value={metadata.alias ?? ""}
|
||||||
'single',
|
onChange={onUpdateMetadata("alias")}
|
||||||
'queued',
|
/>
|
||||||
'restart'
|
<InputText
|
||||||
]}
|
multiline
|
||||||
/>
|
label="Description"
|
||||||
<div className="automation-editor--info-box--tags">
|
value={metadata.description ?? ""}
|
||||||
<h1>Tags</h1>
|
onChange={onUpdateMetadata("description")}
|
||||||
<div className="automation-editor--info-box--tag-list">
|
/>
|
||||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
<InputList
|
||||||
|
label="Mode"
|
||||||
|
current={metadata.mode}
|
||||||
|
onChange={onUpdateMetadata("mode")}
|
||||||
|
options={["parallel", "single", "queued", "restart"]}
|
||||||
|
/>
|
||||||
|
<div className="automation-editor--info-box--tags">
|
||||||
|
<h1>Tags</h1>
|
||||||
|
<div className="automation-editor--info-box--tag-list">
|
||||||
|
{tags.map(([tagName, tagValue], tagIndex) => (
|
||||||
|
<div key={tagIndex} className="automation-editor--info-box--tag">
|
||||||
|
<InputAutoText
|
||||||
|
value={tagName}
|
||||||
|
label="Name"
|
||||||
|
onChange={(v) => updateTagName(v, tagIndex)}
|
||||||
|
options={foundNewTagNames}
|
||||||
|
error={errorIndex === tagIndex ? error : undefined}
|
||||||
|
/>
|
||||||
|
<InputAutoText
|
||||||
|
value={tagValue}
|
||||||
|
label="Tag"
|
||||||
|
onChange={(v) => onUpdateTags(v, tagIndex)}
|
||||||
|
options={tagDB.getTagValues(tagName)}
|
||||||
|
error={errorIndex === tagIndex ? error : undefined}
|
||||||
|
/>
|
||||||
|
<ButtonIcon
|
||||||
|
className="automation-editor--info-box--tag--trash"
|
||||||
|
onClick={() => onRemoveTag(tagIndex)}
|
||||||
|
icon={<TrashIcon />}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<hr />
|
||||||
|
<div className="automation-editor--info-box--tag">
|
||||||
<InputAutoText
|
<InputAutoText
|
||||||
value={tagName}
|
value={newTag[0]}
|
||||||
label="Name"
|
label="Name"
|
||||||
onChange={v => updateTagName(v, tagIndex)}
|
onChange={(v) => setNewTag([v, newTag[1]])}
|
||||||
options={foundNewTagNames}
|
options={foundNewTagNames}
|
||||||
error={errorIndex === tagIndex ? error : undefined}
|
error={errorIndex === "new" ? error : undefined}
|
||||||
/>
|
/>
|
||||||
<InputAutoText
|
<InputAutoText
|
||||||
value={tagValue}
|
value={newTag[1]}
|
||||||
label="Tag"
|
label="Tag"
|
||||||
onChange={v => onUpdateTags(v, tagIndex)}
|
onChange={(v) => setNewTag([newTag[0], v])}
|
||||||
options={tagDB.getTagValues(tagName)}
|
options={tagDB.getTagValues(newTag[0])}
|
||||||
error={errorIndex === tagIndex ? error : undefined}
|
error={errorIndex === "new" ? error : undefined}
|
||||||
/>
|
/>
|
||||||
<Button className="automation-editor--info-box--tag--trash" onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
<ButtonIcon
|
||||||
</div>)}
|
className="automation-editor--info-box--tag--add"
|
||||||
</div>
|
onClick={addNewTag}
|
||||||
<hr />
|
icon={<AddIcon />}
|
||||||
<div className="automation-editor--info-box--tag">
|
/>
|
||||||
<InputAutoText
|
</div>
|
||||||
value={newTag[0]}
|
|
||||||
label="Name"
|
|
||||||
onChange={v => setNewTag([v, newTag[1]])}
|
|
||||||
options={foundNewTagNames}
|
|
||||||
error={errorIndex === 'new' ? error : undefined}
|
|
||||||
/>
|
|
||||||
<InputAutoText
|
|
||||||
value={newTag[1]}
|
|
||||||
label="Tag"
|
|
||||||
onChange={v => setNewTag([newTag[0], v])}
|
|
||||||
options={tagDB.getTagValues(newTag[0])}
|
|
||||||
error={errorIndex === 'new' ? error : undefined}
|
|
||||||
/>
|
|
||||||
<Button className="automation-editor--info-box--tag--add" onClick={addNewTag} ><AddIcon /></Button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{children}
|
||||||
</div>
|
</div>
|
||||||
{children}
|
);
|
||||||
</div>
|
};
|
||||||
}
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
.automation-editor {
|
.automation-editor {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
position: relative;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -27,13 +28,9 @@
|
|||||||
.automation-editor--flow-wrapper--toolbar {
|
.automation-editor--flow-wrapper--toolbar {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
|
gap: 0.25em;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
margin-top: 0.25em;
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
|
||||||
height: 0;
|
|
||||||
opacity: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
||||||
@@ -64,14 +61,39 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--icon {
|
.automation-editor .automation-editor--info-box--icon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0em;
|
left: 0.25em;
|
||||||
bottom: 0.5em;
|
bottom: 0em;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
|
max-width: 1.5em;
|
||||||
|
max-height: 1.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
|
left: 0.1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor.loading .mock-list {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
width: 40%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.automation-editor.loading .mock-graph {
|
||||||
|
position: absolute;
|
||||||
|
left: 40%;
|
||||||
|
width: 60%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor .linear-loader {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
@@ -21,7 +21,7 @@ const Template: ComponentStory<typeof AutomationEditor> = args => {
|
|||||||
return <Page>
|
return <Page>
|
||||||
<AutomationEditor
|
<AutomationEditor
|
||||||
{...args}
|
{...args}
|
||||||
tagDB={makeTagDB([state as any])}
|
tagDB={makeTagDB(state ? [state] : [])}
|
||||||
automation={state}
|
automation={state}
|
||||||
onUpdate={s => {
|
onUpdate={s => {
|
||||||
window.setTimeout(() => setState(s), 3000)
|
window.setTimeout(() => setState(s), 3000)
|
||||||
|
|||||||
@@ -1,16 +1,21 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
|
import Icon from "@mui/material/Icon";
|
||||||
|
import { CheckMarkIcon } from "components/Icons";
|
||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import { useAutomatioEditorState, EditorData } from './state';
|
import { useAutomatioEditorState, EditorData } from "./state";
|
||||||
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
|
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
|
||||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||||
import { MiniFailure } from 'types/validators/helper';
|
import { MiniFailure } from "types/validators/helper";
|
||||||
import InputYaml from "components/Inputs/InputYaml";
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
import { TagDB } from "components/AutomationList/TagDB";
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
import Skeleton from "@mui/material/Skeleton";
|
||||||
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
import { ArrowBack } from "@mui/icons-material";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
automation?: AutomationData;
|
automation?: AutomationData;
|
||||||
@@ -35,113 +40,171 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
save,
|
save,
|
||||||
saveAndUpdate,
|
saveAndUpdate,
|
||||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||||
|
|
||||||
const [closeInfo, setCloseInfo] = useState(false);
|
const [closeInfo, setCloseInfo] = useState(false);
|
||||||
|
const [
|
||||||
|
{ ckFlipped },
|
||||||
|
setCookies,
|
||||||
|
// eslint-disable-next-line
|
||||||
|
_,
|
||||||
|
] = useCookies(["ckFlipped"]);
|
||||||
|
// alias
|
||||||
|
const flipped = dims.flipped ? true : ckFlipped === "1";
|
||||||
|
const setFlipped = (v: boolean) => setCookies("ckFlipped", v ? "1" : "0");
|
||||||
// render
|
// render
|
||||||
if (state.status === 'loading') {
|
if (state.status === "loading") {
|
||||||
return <div className="automation-editor loading">
|
return (
|
||||||
Loading...
|
<div className="automation-editor loading">
|
||||||
</div>
|
<LinearProgress className="linear-loader" />
|
||||||
}
|
<Skeleton className="mock-list" variant="rectangular" />
|
||||||
if (state.status === 'invalid') {
|
<Skeleton className="mock-graph" variant="rectangular" />
|
||||||
return <ValidationBox
|
|
||||||
failures={state.failures}
|
|
||||||
data={state.data}
|
|
||||||
validate={validate}
|
|
||||||
onSave={saveAndUpdate}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
return <div className="automation-editor">
|
|
||||||
<AutoInfoBox
|
|
||||||
className={closeInfo ? "hide" : "show"}
|
|
||||||
metadata={state.data.metadata}
|
|
||||||
tags={state.data.tags}
|
|
||||||
onUpdate={updateMetadata}
|
|
||||||
tagDB={tagDB}
|
|
||||||
>
|
|
||||||
<ButtonIcon
|
|
||||||
className="automation-editor--info-box--icon"
|
|
||||||
onClick={() => setCloseInfo(!closeInfo)}
|
|
||||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
|
||||||
>{ArrowIcon}</ButtonIcon>
|
|
||||||
</AutoInfoBox>
|
|
||||||
|
|
||||||
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
|
||||||
<div className="automation-editor--flow-wrapper--toolbar">
|
|
||||||
<Button
|
|
||||||
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
|
||||||
onClick={save}
|
|
||||||
disabled={state.status !== 'changed'}
|
|
||||||
>
|
|
||||||
Save <CheckMarkIcon color="#bf4" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
</div>
|
||||||
<SafeDAGAutomationFlow
|
);
|
||||||
className="automation-editor--flow-wrapper--flow"
|
}
|
||||||
sequence={state.data.sequence}
|
if (state.status === "invalid") {
|
||||||
trigger={state.data.trigger}
|
return (
|
||||||
condition={state.data.condition}
|
<ValidationBox
|
||||||
onSequenceUpdate={updateSequence}
|
failures={state.failures}
|
||||||
onTriggerUpdate={updateTrigger}
|
data={state.data}
|
||||||
onConditionUpdate={updateCondition}
|
validate={validate}
|
||||||
dims={dims}
|
onSave={saveAndUpdate}
|
||||||
/>
|
/>
|
||||||
</div>
|
);
|
||||||
</div>
|
}
|
||||||
}
|
return (
|
||||||
|
<div className="automation-editor">
|
||||||
|
{state.status === "saving" && (
|
||||||
|
<LinearProgress className="linear-loader" />
|
||||||
|
)}
|
||||||
|
<AutoInfoBox
|
||||||
|
className={closeInfo ? "hide" : "show"}
|
||||||
|
metadata={state.data.metadata}
|
||||||
|
tags={state.data.tags}
|
||||||
|
onUpdate={updateMetadata}
|
||||||
|
tagDB={tagDB}
|
||||||
|
>
|
||||||
|
<ButtonIcon
|
||||||
|
className="automation-editor--info-box--icon"
|
||||||
|
onClick={() => setCloseInfo(!closeInfo)}
|
||||||
|
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
||||||
|
color="success"
|
||||||
|
icon={<ArrowBack />}
|
||||||
|
/>
|
||||||
|
</AutoInfoBox>
|
||||||
|
|
||||||
|
<div
|
||||||
|
className={["automation-editor--flow-wrapper", state.status].join(" ")}
|
||||||
|
>
|
||||||
|
<div className="automation-editor--flow-wrapper--toolbar">
|
||||||
|
{!dims.flipped && (
|
||||||
|
<Button
|
||||||
|
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
|
||||||
|
onClick={() => setFlipped(!flipped)}
|
||||||
|
>
|
||||||
|
<Icon>{flipped ? "flip_to_front" : "flip_to_back"}</Icon>
|
||||||
|
Flip
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
||||||
|
onClick={save}
|
||||||
|
disabled={state.status !== "changed"}
|
||||||
|
>
|
||||||
|
Save <CheckMarkIcon color="#bf4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<SafeDAGAutomationFlow
|
||||||
|
className="automation-editor--flow-wrapper--flow"
|
||||||
|
sequence={state.data.sequence}
|
||||||
|
trigger={state.data.trigger}
|
||||||
|
condition={state.data.condition}
|
||||||
|
onSequenceUpdate={updateSequence}
|
||||||
|
onTriggerUpdate={updateTrigger}
|
||||||
|
onConditionUpdate={updateCondition}
|
||||||
|
dims={{
|
||||||
|
...dims,
|
||||||
|
flipped,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const ValidationBox: FC<{
|
export const ValidationBox: FC<{
|
||||||
failures: MiniFailure[]
|
failures: MiniFailure[];
|
||||||
validate: (d: any) => MiniFailure[] | null,
|
validate: (d: any) => MiniFailure[] | null;
|
||||||
data: EditorData,
|
data: EditorData;
|
||||||
onSave: (d: EditorData) => void,
|
onSave: (d: EditorData) => void;
|
||||||
}> = props => {
|
}> = (props) => {
|
||||||
|
|
||||||
const [{ failures, data }, setState] = useState({
|
const [{ failures, data }, setState] = useState({
|
||||||
failures: props.failures,
|
failures: props.failures,
|
||||||
data: props.data,
|
data: props.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => {
|
const makeSave =
|
||||||
const newData = {
|
<K extends keyof EditorData>(k: K) =>
|
||||||
...data,
|
(d: EditorData[K]) => {
|
||||||
[k]: d,
|
const newData = {
|
||||||
}
|
...data,
|
||||||
const newFails = props.validate(newData);
|
[k]: d,
|
||||||
if (newFails) {
|
};
|
||||||
setState({
|
const newFails = props.validate(newData);
|
||||||
failures: newFails,
|
if (newFails) {
|
||||||
data: newData,
|
setState({
|
||||||
})
|
failures: newFails,
|
||||||
} else {
|
data: newData,
|
||||||
setState({
|
});
|
||||||
failures: [],
|
} else {
|
||||||
data: newData,
|
setState({
|
||||||
})
|
failures: [],
|
||||||
}
|
data: newData,
|
||||||
}
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return <div className="automation-editor-failures">
|
return (
|
||||||
<ul>
|
<div className="automation-editor-failures">
|
||||||
{failures.map((f, i) => <>
|
<ul>
|
||||||
<li key={i}>
|
{failures.map((f, i) => (
|
||||||
<b>{f.path}</b>:
|
<>
|
||||||
<ul>
|
<li key={i}>
|
||||||
{f.message.map((m, j) => <li key={j}>
|
<b>{f.path}</b>:
|
||||||
{m}
|
<ul>
|
||||||
</li>)}
|
{f.message.map((m, j) => (
|
||||||
</ul>
|
<li key={j}>{m}</li>
|
||||||
</li>
|
))}
|
||||||
</>)}
|
</ul>
|
||||||
</ul>
|
</li>
|
||||||
<span>Please correct the automation file manually and then continue!</span>
|
</>
|
||||||
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} />
|
))}
|
||||||
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} />
|
</ul>
|
||||||
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} />
|
<span>
|
||||||
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} />
|
Please correct the automation file manually and then continue!
|
||||||
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} />
|
</span>
|
||||||
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
|
<InputYaml
|
||||||
</div>
|
label="Metadata"
|
||||||
}
|
value={data.metadata}
|
||||||
|
onChange={makeSave("metadata")}
|
||||||
|
/>
|
||||||
|
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
|
||||||
|
<InputYaml
|
||||||
|
label="Trigger"
|
||||||
|
value={data.trigger}
|
||||||
|
onChange={makeSave("trigger")}
|
||||||
|
/>
|
||||||
|
<InputYaml
|
||||||
|
label="Condition"
|
||||||
|
value={data.condition}
|
||||||
|
onChange={makeSave("condition")}
|
||||||
|
/>
|
||||||
|
<InputYaml
|
||||||
|
label="Actions"
|
||||||
|
value={data.sequence}
|
||||||
|
onChange={makeSave("sequence")}
|
||||||
|
/>
|
||||||
|
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
|
||||||
|
Save
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -6,7 +6,7 @@ import { MiniFailure } from '../../types/validators/helper';
|
|||||||
|
|
||||||
export type EditorData = ReturnType<typeof genEditorData>;
|
export type EditorData = ReturnType<typeof genEditorData>;
|
||||||
export type EditorState = {
|
export type EditorState = {
|
||||||
status: 'unchanged' | 'changed',
|
status: 'unchanged' | 'changed' | 'saving',
|
||||||
data: EditorData
|
data: EditorData
|
||||||
} | {
|
} | {
|
||||||
status: 'loading'
|
status: 'loading'
|
||||||
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
|
|||||||
}), {})
|
}), {})
|
||||||
};
|
};
|
||||||
update({
|
update({
|
||||||
status: "loading",
|
status: "saving",
|
||||||
|
data,
|
||||||
})
|
})
|
||||||
onSave(cleanData);
|
onSave(cleanData);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -140,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,
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ 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 { Page } from "components/Page";
|
||||||
|
import { CookiesProvider } from "react-cookie";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Box',
|
title: 'App/AutomationList/Box',
|
||||||
@@ -16,10 +17,12 @@ 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 <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)
|
||||||
|
}} />
|
||||||
|
</CookiesProvider>
|
||||||
</Page>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,95 +1,142 @@
|
|||||||
import "./AutomationListBox.css";
|
import "./AutomationListBox.css";
|
||||||
import { FC, useState } from 'react';
|
import { FC, useState } from "react";
|
||||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import { makeGrouping } from "./automationGrouper";
|
import { makeGrouping } from "./automationGrouper";
|
||||||
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
|
||||||
export type Props = {
|
export type Props = {
|
||||||
automations: AutomationData[];
|
automations: AutomationData[];
|
||||||
selected: number;
|
selected: number;
|
||||||
onSelectAutomation: (i: number) => void;
|
onSelectAutomation: (i: number) => void;
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
onAdd: () => void;
|
onAdd: () => void;
|
||||||
}
|
};
|
||||||
|
|
||||||
|
const useAutomationListBoxState = () => {
|
||||||
|
const [
|
||||||
|
cookies,
|
||||||
|
setCookies,
|
||||||
|
// eslint-disable-next-line
|
||||||
|
_,
|
||||||
|
] = useCookies(["albSearchText", "albSelected"]);
|
||||||
|
let initialSelected = [];
|
||||||
|
try {
|
||||||
|
initialSelected = JSON.parse(cookies.albSelected);
|
||||||
|
if (!Array.isArray(initialSelected)) {
|
||||||
|
initialSelected = [initialSelected];
|
||||||
|
}
|
||||||
|
initialSelected = initialSelected.map(Number);
|
||||||
|
// eslint-disable-next-line
|
||||||
|
} catch (_) {}
|
||||||
|
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
|
||||||
|
const [selectedTagIdx, setSelectedTagIdx] =
|
||||||
|
useState<number[]>(initialSelected);
|
||||||
|
|
||||||
|
return {
|
||||||
|
searchText,
|
||||||
|
setSearchText(v: string) {
|
||||||
|
setSearchText(v);
|
||||||
|
setCookies("albSearchText", v);
|
||||||
|
},
|
||||||
|
setSelectedTagIdx(n: number[]) {
|
||||||
|
setSelectedTagIdx(n);
|
||||||
|
setCookies("albSelected", JSON.stringify(n));
|
||||||
|
},
|
||||||
|
selectedTagIdx,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export const AutomationListBox: FC<Props> = ({
|
export const AutomationListBox: FC<Props> = ({
|
||||||
automations,
|
automations,
|
||||||
selected,
|
selected,
|
||||||
onSelectAutomation,
|
onSelectAutomation,
|
||||||
onAdd,
|
onAdd,
|
||||||
onRemove,
|
onRemove,
|
||||||
}) => {
|
}) => {
|
||||||
|
const tags = getTagList(automations);
|
||||||
|
const { searchText, setSearchText, selectedTagIdx, setSelectedTagIdx } =
|
||||||
|
useAutomationListBoxState();
|
||||||
|
const filteredAutomations = filterAutomations(
|
||||||
|
automations,
|
||||||
|
searchText.toLowerCase()
|
||||||
|
);
|
||||||
|
const grouping = makeGrouping(
|
||||||
|
filteredAutomations.map(([a, _]) => a),
|
||||||
|
selectedTagIdx.map((i) => tags[i]),
|
||||||
|
selected
|
||||||
|
);
|
||||||
|
|
||||||
const tags = getTagList(automations);
|
return (
|
||||||
const [searchText, setSearchText] = useState('');
|
<div className="automation-list-box">
|
||||||
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
<div className="automation-list-box--nav">
|
||||||
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
<InputText label="Search" value={searchText} onChange={setSearchText} />
|
||||||
const grouping = makeGrouping(
|
<InputMultiSelect
|
||||||
filteredAutomations.map(([a, _]) => a),
|
label="Tags"
|
||||||
selectedTagIdx.map(i => tags[i]),
|
selected={selectedTagIdx}
|
||||||
selected,
|
onChange={setSelectedTagIdx}
|
||||||
)
|
options={tags}
|
||||||
|
max={3}
|
||||||
return <div className="automation-list-box">
|
/>
|
||||||
<div className="automation-list-box--nav">
|
</div>
|
||||||
<InputText
|
<div className="automation-list-box--body">
|
||||||
label="Search"
|
<AutomationListBoxGroup
|
||||||
value={searchText}
|
events={{
|
||||||
onChange={setSearchText}
|
onSelectAutomation,
|
||||||
/>
|
onRemove,
|
||||||
<InputMultiSelect
|
}}
|
||||||
label="Tags"
|
autos={filteredAutomations}
|
||||||
selected={selectedTagIdx}
|
grouping={grouping}
|
||||||
onChange={setSelectedTagIdx}
|
selectedAutomationIdx={selected}
|
||||||
options={tags}
|
/>
|
||||||
max={3}
|
</div>
|
||||||
/>
|
<div className="automation-list-box--bottom">
|
||||||
</div>
|
<Button onClick={onAdd}>Add</Button>
|
||||||
<div className="automation-list-box--body">
|
<span>
|
||||||
<AutomationListBoxGroup
|
Showing Automations: {filteredAutomations.length} out of{" "}
|
||||||
events={{
|
{automations.length}
|
||||||
onSelectAutomation,
|
</span>
|
||||||
onRemove
|
</div>
|
||||||
}}
|
|
||||||
autos={filteredAutomations}
|
|
||||||
grouping={grouping}
|
|
||||||
selectedAutomationIdx={selected}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div className="automation-list-box--bottom">
|
|
||||||
<Button onClick={onAdd}>Add</Button>
|
|
||||||
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
}
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getTagList = (autos: AutomationData[]): string[] =>
|
||||||
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
|
Object.keys(
|
||||||
.map(a => Object.keys(a.tags))
|
autos
|
||||||
.reduce((all: any, keys) => {
|
.map((a) => Object.keys(a.tags))
|
||||||
|
.reduce((all: any, keys) => {
|
||||||
for (const k of keys) {
|
for (const k of keys) {
|
||||||
all[k] = 1
|
all[k] = 1;
|
||||||
}
|
}
|
||||||
return all;
|
return all;
|
||||||
}, {}))
|
}, {})
|
||||||
|
);
|
||||||
|
|
||||||
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
|
const filterAutomations = (
|
||||||
if (!a.metadata) {
|
autos: AutomationData[],
|
||||||
return true
|
searchText: string
|
||||||
}
|
): Array<[AutomationData, number]> =>
|
||||||
if (searchText.length > 0) {
|
autos
|
||||||
|
.map<[AutomationData, number]>((a, i) => [a, i])
|
||||||
|
.filter(([a, i]) => {
|
||||||
|
if (!a.metadata) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (searchText.length > 0) {
|
||||||
if (
|
if (
|
||||||
!(
|
!(
|
||||||
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
|
(a.metadata.description ?? "")
|
||||||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
|
.toLocaleLowerCase()
|
||||||
)
|
.includes(searchText) ||
|
||||||
|
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
|
||||||
|
)
|
||||||
) {
|
) {
|
||||||
return false
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true
|
return true;
|
||||||
})
|
});
|
||||||
@@ -1,141 +1,166 @@
|
|||||||
|
|
||||||
import { TrashIcon } from "components/Icons";
|
import { TrashIcon } from "components/Icons";
|
||||||
import { Button } from "components/Inputs/Button";
|
|
||||||
import { MetadataBox } from "./AutomationMetadataBox";
|
import { MetadataBox } from "./AutomationMetadataBox";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { AutomationGrouping } from "./automationGrouper";
|
import { AutomationGrouping } from "./automationGrouper";
|
||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
|
||||||
export type AutomationListBoxEvents = {
|
export type AutomationListBoxEvents = {
|
||||||
onSelectAutomation: (i: number) => void,
|
onSelectAutomation: (i: number) => void;
|
||||||
onRemove: (i: number) => void,
|
onRemove: (i: number) => void;
|
||||||
}
|
};
|
||||||
export type AutomationListBoxGroups = {
|
export type AutomationListBoxGroups = {
|
||||||
grouping: AutomationGrouping,
|
grouping: AutomationGrouping;
|
||||||
currentNode: number,
|
currentNode: number;
|
||||||
}
|
};
|
||||||
export type AutomationListBoxProps = {
|
export type AutomationListBoxProps = {
|
||||||
events: AutomationListBoxEvents,
|
events: AutomationListBoxEvents;
|
||||||
groups: AutomationListBoxGroups,
|
groups: AutomationListBoxGroups;
|
||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>;
|
||||||
selectedAutomationIdx: number,
|
selectedAutomationIdx: number;
|
||||||
};
|
};
|
||||||
export type AutomationListBoxGroupProps = {
|
export type AutomationListBoxGroupProps = {
|
||||||
events: AutomationListBoxEvents,
|
events: AutomationListBoxEvents;
|
||||||
grouping: AutomationGrouping,
|
grouping: AutomationGrouping;
|
||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>;
|
||||||
selectedAutomationIdx: number,
|
selectedAutomationIdx: number;
|
||||||
}
|
};
|
||||||
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
|
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
|
||||||
events, grouping, autos, selectedAutomationIdx,
|
events,
|
||||||
|
grouping,
|
||||||
|
autos,
|
||||||
|
selectedAutomationIdx,
|
||||||
}) => {
|
}) => {
|
||||||
if (grouping.top.length === 1) {
|
if (grouping.top.length === 1) {
|
||||||
return <>
|
return (
|
||||||
{convertGroupsToItems(autos, {
|
<>
|
||||||
grouping, currentNode: grouping.top[0],
|
{convertGroupsToItems(
|
||||||
}, events, selectedAutomationIdx)}
|
autos,
|
||||||
</>
|
{
|
||||||
} else {
|
grouping,
|
||||||
return <>
|
currentNode: grouping.top[0],
|
||||||
{grouping.top.map(groupIdx => <AutomationListBoxGroupItem
|
},
|
||||||
key={groupIdx}
|
events,
|
||||||
autos={autos}
|
selectedAutomationIdx
|
||||||
groups={{
|
)}
|
||||||
grouping,
|
</>
|
||||||
currentNode: groupIdx
|
);
|
||||||
}}
|
} else {
|
||||||
events={events}
|
return (
|
||||||
selectedAutomationIdx={selectedAutomationIdx}
|
<>
|
||||||
/>)}
|
{grouping.top.map((groupIdx) => (
|
||||||
</>
|
<AutomationListBoxGroupItem
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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}
|
key={groupIdx}
|
||||||
autos={autos}
|
autos={autos}
|
||||||
groups={{
|
groups={{
|
||||||
grouping,
|
grouping,
|
||||||
currentNode: groupIdx
|
currentNode: groupIdx,
|
||||||
}}
|
}}
|
||||||
events={events}
|
events={events}
|
||||||
selectedAutomationIdx={selectedAutomationIdx}
|
selectedAutomationIdx={selectedAutomationIdx}
|
||||||
/>)
|
/>
|
||||||
}
|
))}
|
||||||
return <></>
|
</>
|
||||||
}
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
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<{
|
export const AutomationListBoxGroupItem: FC<{
|
||||||
events: AutomationListBoxEvents,
|
events: AutomationListBoxEvents;
|
||||||
groups: AutomationListBoxGroups,
|
groups: AutomationListBoxGroups;
|
||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>;
|
||||||
selectedAutomationIdx: number,
|
selectedAutomationIdx: number;
|
||||||
}> = ({
|
}> = ({ autos, groups, events, selectedAutomationIdx }) => {
|
||||||
autos, groups, events, selectedAutomationIdx,
|
const groupData = groups.grouping.getData(groups.currentNode);
|
||||||
}) => {
|
const automations = groups.grouping.getAutomations(groups.currentNode);
|
||||||
const groupData = groups.grouping.getData(groups.currentNode);
|
const [open, setOpen] = useState(false);
|
||||||
const automations = groups.grouping.getAutomations(groups.currentNode);
|
const isOther = groupData.isOther;
|
||||||
const [open, setOpen] = useState(false);
|
const openIcon = !open ? "⊕" : "⊖";
|
||||||
const isOther = groupData.isOther;
|
const total = isOther ? (
|
||||||
const openIcon = !open ? "⊕" : "⊖";
|
<small>
|
||||||
const total = isOther ? <small>
|
{automations.length} automation{automations.length !== 1 ? "s" : ""}{" "}
|
||||||
{automations.length} automation{automations.length !== 1 ? 's' : ''} {groupData.isOther ? "" : "(untagged)"}
|
{groupData.isOther ? "" : "(untagged)"}
|
||||||
</small> : <></>
|
</small>
|
||||||
return <div className={[
|
) : (
|
||||||
"automation-list-box--body--group",
|
<></>
|
||||||
isOther ? 'other' : '',
|
);
|
||||||
groupData.selected ? 'selected' : '',
|
return (
|
||||||
].join(' ')}>
|
<div
|
||||||
<b onClick={() => setOpen(!open)}>{groupData.name} {openIcon} {total}</b>
|
className={[
|
||||||
{open && convertGroupsToItems(autos, groups, events, selectedAutomationIdx)}
|
"automation-list-box--body--group",
|
||||||
</div>
|
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<{
|
export const AutomationListBoxItem: FC<{
|
||||||
auto: [AutomationData, number],
|
auto: [AutomationData, number];
|
||||||
isSelected: boolean,
|
isSelected: boolean;
|
||||||
events: AutomationListBoxEvents,
|
events: AutomationListBoxEvents;
|
||||||
}> = ({
|
}> = ({
|
||||||
events: {
|
events: { onRemove, onSelectAutomation },
|
||||||
onRemove,
|
auto: [auto, autoIndex],
|
||||||
onSelectAutomation,
|
isSelected,
|
||||||
},
|
|
||||||
auto: [
|
|
||||||
auto, autoIndex
|
|
||||||
],
|
|
||||||
isSelected,
|
|
||||||
}) => {
|
}) => {
|
||||||
let title = "BadAuto<<Missing Metadata>>"
|
let title = "BadAuto<<Missing Metadata>>";
|
||||||
if (auto.metadata) {
|
if (auto.metadata) {
|
||||||
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
|
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`;
|
||||||
}
|
}
|
||||||
return <div
|
return (
|
||||||
key={autoIndex}
|
<div
|
||||||
className={["automation-list-box--body--item", isSelected ? 'selected' : ''].join(' ')}
|
key={autoIndex}
|
||||||
title={title}
|
className={[
|
||||||
onClick={() => onSelectAutomation(autoIndex)}
|
"automation-list-box--body--item",
|
||||||
>
|
isSelected ? "selected" : "",
|
||||||
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
|
].join(" ")}
|
||||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
title={title}
|
||||||
</div>
|
onClick={() => onSelectAutomation(autoIndex)}
|
||||||
}
|
>
|
||||||
|
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
|
||||||
|
<ButtonIcon onClick={() => onRemove(autoIndex)} icon={<TrashIcon />} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -45,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>
|
||||||
|
}
|
||||||
@@ -18,6 +18,25 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Loading state */
|
||||||
|
.automation-list--root.loading {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.loading>* {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.loading .automation-list--circle-loader {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
/* list children: on hide */
|
/* list children: on hide */
|
||||||
.automation-list--list.hide>.automation-list-box {
|
.automation-list--list.hide>.automation-list-box {
|
||||||
width: 0;
|
width: 0;
|
||||||
@@ -31,6 +50,7 @@
|
|||||||
|
|
||||||
.automation-list--list.hide>.automation-list--list-hide {
|
.automation-list--list.hide>.automation-list--list-hide {
|
||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
|
left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* list children: normal */
|
/* list children: normal */
|
||||||
@@ -39,8 +59,10 @@
|
|||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list--list-hide {
|
.automation-list--list .automation-list--list-hide {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0.5em;
|
bottom: 0em;
|
||||||
right: 0.5em;
|
left: 0.5em;
|
||||||
|
max-width: 1.5em;
|
||||||
|
max-height: 1.5em;
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
.automation-list--root.mobile .automation-list--list-hide {
|
.automation-list--root.mobile .automation-list--list-hide {
|
||||||
transform: rotate(90deg);
|
transform: rotate(90deg);
|
||||||
left: 1.25em;
|
left: 0.25em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list--root.mobile .automation-editor--info-box {
|
.automation-list--root.mobile .automation-editor--info-box {
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.automation-list--root.mobile .automation-editor--info-box--icon {
|
.automation-list--root.mobile .automation-editor--info-box--icon {
|
||||||
left: 1.25em;
|
left: 0.5em;
|
||||||
bottom: 0em;
|
bottom: 0em;
|
||||||
background-color: var(--primary);
|
background-color: var(--primary);
|
||||||
transform: rotate(90deg);
|
transform: rotate(90deg);
|
||||||
@@ -50,8 +50,8 @@
|
|||||||
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
||||||
transform: rotate(270deg);
|
transform: rotate(270deg);
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0.75em;
|
top: 0;
|
||||||
z-index: 20;
|
z-index: 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* info box hide */
|
/* info box hide */
|
||||||
@@ -64,7 +64,15 @@
|
|||||||
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
|
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
|
||||||
transform: rotate(270deg);
|
transform: rotate(270deg);
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0.75em;
|
top: 0em;
|
||||||
background-color: var(--green-opaque);
|
left: 0.25em;
|
||||||
z-index: 30;
|
z-index: 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
||||||
|
height: 0;
|
||||||
|
opacity: 0;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
@@ -1,17 +1,20 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import "./index.mobile.css";
|
import "./index.mobile.css";
|
||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { FC, useState } from "react";
|
import { FC, ReactNode, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { defaultAutomation } from 'utils/defaults';
|
import { defaultAutomation } from "utils/defaults";
|
||||||
import { ArrowIcon } from "components/Icons";
|
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
import { ApiService } from "apiService/core";
|
import { ApiService } from "apiService/core";
|
||||||
import { AutomationListBox } from "./AutomationListBox";
|
import { AutomationListBox } from "./AutomationListBox";
|
||||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||||
import useWindowSize from "utils/useWindowSize";
|
import useWindowSize from "utils/useWindowSize";
|
||||||
import { makeTagDB } from "./TagDB";
|
import { makeTagDB } from "./TagDB";
|
||||||
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
import CircularProgress from "@mui/material/CircularProgress";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
import { useHA } from "haService";
|
||||||
|
import { ArrowBack } from "@mui/icons-material";
|
||||||
|
|
||||||
interface AutomationListParams {
|
interface AutomationListParams {
|
||||||
automations: AutomationData[];
|
automations: AutomationData[];
|
||||||
@@ -19,8 +22,35 @@ interface AutomationListParams {
|
|||||||
onAdd: (auto: AutomationData) => void;
|
onAdd: (auto: AutomationData) => void;
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGAutomationFlowDims;
|
||||||
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const useAutomationListState = () => {
|
||||||
|
const [
|
||||||
|
cookies,
|
||||||
|
setCookies,
|
||||||
|
// eslint-disable-next-line
|
||||||
|
_,
|
||||||
|
] = useCookies(["alCurrent"]);
|
||||||
|
let initialCurrent = 0;
|
||||||
|
try {
|
||||||
|
initialCurrent = Number(cookies.alCurrent ?? "0");
|
||||||
|
} catch (_) {}
|
||||||
|
|
||||||
|
const [hideList, setHideList] = useState(false);
|
||||||
|
const [current, setCurrent] = useState(initialCurrent);
|
||||||
|
|
||||||
|
return {
|
||||||
|
hideList,
|
||||||
|
setHideList,
|
||||||
|
current,
|
||||||
|
setCurrent(i: number) {
|
||||||
|
setCurrent(i);
|
||||||
|
setCookies("alCurrent", String(i));
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export const AutomationList: FC<AutomationListParams> = ({
|
export const AutomationList: FC<AutomationListParams> = ({
|
||||||
automations,
|
automations,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
@@ -30,48 +60,65 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
children,
|
children,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [hideList, setHideList] = useState(false);
|
const { hideList, setHideList, current, setCurrent } =
|
||||||
const [current, setCurrent] = useState(0);
|
useAutomationListState();
|
||||||
const { isMobile } = useWindowSize();
|
const { isMobile } = useWindowSize();
|
||||||
// alias
|
// alias
|
||||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
const currentAuto = automations.length > 0 ? automations[current] : null;
|
||||||
const tagDB = makeTagDB(automations);
|
const tagDB = makeTagDB(automations);
|
||||||
// render
|
// render
|
||||||
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
|
return (
|
||||||
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
|
<div
|
||||||
<AutomationListBox
|
className={["automation-list--root", isMobile ? "mobile" : ""].join(" ")}
|
||||||
automations={automations}
|
>
|
||||||
onAdd={() => {
|
<div
|
||||||
onAdd(defaultAutomation(String(Date.now())));
|
className={["automation-list--list", hideList ? "hide" : "show"].join(
|
||||||
setCurrent(automations.length)
|
" "
|
||||||
}}
|
)}
|
||||||
onSelectAutomation={i => {
|
|
||||||
setCurrent(i);
|
|
||||||
if (isMobile) {
|
|
||||||
setHideList(true)
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
selected={current}
|
|
||||||
onRemove={onRemove}
|
|
||||||
/>
|
|
||||||
<ButtonIcon
|
|
||||||
onClick={() => setHideList(!hideList)}
|
|
||||||
className="automation-list--list-hide"
|
|
||||||
>
|
>
|
||||||
{ArrowIcon}
|
<AutomationListBox
|
||||||
</ButtonIcon>
|
automations={automations}
|
||||||
|
onAdd={() => {
|
||||||
|
onAdd(defaultAutomation(String(Date.now())));
|
||||||
|
setCurrent(automations.length);
|
||||||
|
if (isMobile) {
|
||||||
|
setHideList(true);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onSelectAutomation={(i) => {
|
||||||
|
setCurrent(i);
|
||||||
|
if (isMobile) {
|
||||||
|
setHideList(true);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
selected={current}
|
||||||
|
onRemove={onRemove}
|
||||||
|
/>
|
||||||
|
<ButtonIcon
|
||||||
|
onClick={() => setHideList(!hideList)}
|
||||||
|
className="automation-list--list-hide"
|
||||||
|
icon={<ArrowBack />}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="automation-list--viewer">
|
||||||
|
{currentAuto ? (
|
||||||
|
<AutomationEditor
|
||||||
|
automation={currentAuto}
|
||||||
|
onUpdate={(a) => onUpdate(current, a)}
|
||||||
|
dims={{
|
||||||
|
...dims,
|
||||||
|
flipped: isMobile,
|
||||||
|
}}
|
||||||
|
tagDB={tagDB}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<></>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{children}
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list--viewer">
|
);
|
||||||
{currentAuto ? <AutomationEditor
|
};
|
||||||
automation={currentAuto}
|
|
||||||
onUpdate={a => onUpdate(current, a)}
|
|
||||||
dims={dims}
|
|
||||||
tagDB={tagDB}
|
|
||||||
/> : <></>}
|
|
||||||
</div>
|
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ConnectedAutomationListParams {
|
interface ConnectedAutomationListParams {
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGAutomationFlowDims;
|
||||||
@@ -79,25 +126,44 @@ interface ConnectedAutomationListParams {
|
|||||||
}
|
}
|
||||||
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
||||||
api: {
|
api: {
|
||||||
state: {
|
state: { automations },
|
||||||
automations,
|
...methods
|
||||||
},
|
|
||||||
removeAutomation,
|
|
||||||
updateAutomation,
|
|
||||||
},
|
},
|
||||||
dims
|
dims,
|
||||||
}) => {
|
}) => {
|
||||||
|
const { reloadAutomations } = useHA();
|
||||||
|
const removeAutomation = async (args: any) => {
|
||||||
|
const resp = await methods.removeAutomation(args);
|
||||||
|
await reloadAutomations();
|
||||||
|
return resp;
|
||||||
|
};
|
||||||
|
const updateAutomation = async (args: any) => {
|
||||||
|
const resp = await methods.updateAutomation(args);
|
||||||
|
await reloadAutomations();
|
||||||
|
return resp;
|
||||||
|
};
|
||||||
if (!automations.ready) {
|
if (!automations.ready) {
|
||||||
return <span>Loading...</span>
|
return (
|
||||||
|
<div className="automation-list--root loading">
|
||||||
|
<LinearProgress />
|
||||||
|
<div className="automation-list--circle-loader">
|
||||||
|
<CircularProgress />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if (!automations.ok) {
|
if (!automations.ok) {
|
||||||
return <span>Error {automations.error}</span>
|
return <span>Error {automations.error}</span>;
|
||||||
}
|
}
|
||||||
return <AutomationList
|
return (
|
||||||
dims={dims}
|
<AutomationList
|
||||||
automations={automations.data.data}
|
dims={dims}
|
||||||
onAdd={auto => updateAutomation({ auto, index: automations.data.totalItems + 1 })}
|
automations={automations.data.data}
|
||||||
onRemove={index => removeAutomation({ index })}
|
onAdd={(auto) =>
|
||||||
onUpdate={(index, auto) => updateAutomation({ index, auto })}
|
updateAutomation({ auto, index: automations.data.totalItems + 1 })
|
||||||
/>
|
}
|
||||||
}
|
onRemove={(index) => removeAutomation({ index })}
|
||||||
|
onUpdate={(index, auto) => updateAutomation({ index, auto })}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Classes } from "jss";
|
import { Classes } from "jss";
|
||||||
import { FC, useState, useEffect } from 'react';
|
import { FC, useState, useEffect } from "react";
|
||||||
import { getConditionDefaultValues } from "utils/defaults";
|
import { getConditionDefaultValues } from "utils/defaults";
|
||||||
import { AutomationCondition } from "types/automations/conditions";
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
import { CheckMarkIcon, PencilIcon } from "components/Icons";
|
import { CheckMarkIcon, PencilIcon } from "components/Icons";
|
||||||
@@ -8,122 +8,153 @@ import InputYaml from "components/Inputs/InputYaml";
|
|||||||
import { getEditor } from "./editorRender";
|
import { getEditor } from "./editorRender";
|
||||||
import { useStyles } from "./style";
|
import { useStyles } from "./style";
|
||||||
import { getViewer } from "./viewRender";
|
import { getViewer } from "./viewRender";
|
||||||
|
import useWindowSize from "utils/useWindowSize";
|
||||||
|
import { useHA } from "haService";
|
||||||
|
import { getSubTypeList } from "utils/automations";
|
||||||
|
|
||||||
export const ConditionNode: FC<{
|
export const ConditionNode: FC<{
|
||||||
condition: AutomationCondition;
|
condition: AutomationCondition;
|
||||||
displayMode: boolean;
|
displayMode: boolean;
|
||||||
showDelete?: boolean;
|
showDelete?: boolean;
|
||||||
onDelete?: (which: 'root' | number) => void;
|
onDelete?: (which: "root" | number) => void;
|
||||||
onUpdate?: (data: AutomationCondition) => void;
|
onUpdate?: (data: AutomationCondition) => void;
|
||||||
children?: (props: {
|
children?: (props: { classes: Classes<string> }) => JSX.Element;
|
||||||
classes: Classes<string>
|
|
||||||
}) => JSX.Element,
|
|
||||||
}> = ({
|
}> = ({
|
||||||
condition,
|
condition,
|
||||||
showDelete = false,
|
showDelete = false,
|
||||||
displayMode = true,
|
displayMode = true,
|
||||||
onDelete = () => { },
|
onDelete = () => {},
|
||||||
onUpdate = () => { },
|
onUpdate = () => {},
|
||||||
children = () => { },
|
children = () => {},
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
||||||
const [yamlMode, setYamlMode] = useState(false);
|
const [yamlMode, setYamlMode] = useState(false);
|
||||||
// alias
|
const { isMobile } = useWindowSize();
|
||||||
const effectiveDM = internalDisplayMode || yamlMode;
|
const ha = useHA();
|
||||||
// effect
|
// alias
|
||||||
useEffect(() => {
|
const effectiveDM = internalDisplayMode || yamlMode;
|
||||||
setInternalDisplayMode(displayMode);
|
// effect
|
||||||
}, [displayMode])
|
useEffect(() => {
|
||||||
useEffect(() => {
|
setInternalDisplayMode(displayMode);
|
||||||
if (yamlMode) {
|
}, [displayMode]);
|
||||||
setInternalDisplayMode(true);
|
useEffect(() => {
|
||||||
}
|
if (yamlMode) {
|
||||||
}, [yamlMode])
|
setInternalDisplayMode(true);
|
||||||
// alias
|
|
||||||
const onAddChild = () => {
|
|
||||||
if (
|
|
||||||
(condition.condition === 'and') ||
|
|
||||||
(condition.condition === 'or') ||
|
|
||||||
(condition.condition === 'not')
|
|
||||||
) {
|
|
||||||
onUpdate({
|
|
||||||
...condition,
|
|
||||||
conditions: condition.conditions.concat({
|
|
||||||
condition: 'or',
|
|
||||||
conditions: []
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// children
|
}, [yamlMode]);
|
||||||
let childrenConditions: JSX.Element;
|
// alias
|
||||||
if (effectiveDM) {
|
const onAddChild = () => {
|
||||||
const Viewer = getViewer(condition);
|
if (
|
||||||
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
|
condition.condition === "and" ||
|
||||||
} else {
|
condition.condition === "or" ||
|
||||||
const Editor = getEditor(condition);
|
condition.condition === "not"
|
||||||
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
|
) {
|
||||||
|
onUpdate({
|
||||||
|
...condition,
|
||||||
|
conditions: condition.conditions.concat({
|
||||||
|
condition: "or",
|
||||||
|
conditions: [],
|
||||||
|
}),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
// styles
|
};
|
||||||
let hasChildren = false;
|
// children
|
||||||
if (condition.condition === "not") {
|
let childrenConditions: JSX.Element;
|
||||||
hasChildren = true
|
if (effectiveDM) {
|
||||||
} else if (condition.condition === 'and') {
|
const Viewer = getViewer(condition);
|
||||||
hasChildren = true
|
childrenConditions = (
|
||||||
} else if (condition.condition === 'or') {
|
<Viewer condition={condition} onChange={onUpdate} namer={ha.namer} />
|
||||||
hasChildren = true
|
);
|
||||||
}
|
} else {
|
||||||
const { classes } = useStyles({ hasChildren });
|
const Editor = getEditor(condition);
|
||||||
|
childrenConditions = (
|
||||||
// components
|
<Editor condition={condition} onChange={onUpdate} ha={ha} />
|
||||||
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
);
|
||||||
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
|
||||||
|
|
||||||
return <div className={classes.root}>
|
|
||||||
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
|
||||||
<div className={classes.title}>
|
|
||||||
<InputList
|
|
||||||
label=""
|
|
||||||
className={classes.titleText}
|
|
||||||
current={condition.condition}
|
|
||||||
options={[
|
|
||||||
'or', 'not', 'and',
|
|
||||||
'template',
|
|
||||||
'numeric_state',
|
|
||||||
'state',
|
|
||||||
'time',
|
|
||||||
'trigger',
|
|
||||||
'zone',
|
|
||||||
]}
|
|
||||||
onChange={(n: any) => onUpdate({
|
|
||||||
...getConditionDefaultValues(n),
|
|
||||||
...condition,
|
|
||||||
condition: n,
|
|
||||||
} as any)}
|
|
||||||
/>
|
|
||||||
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
|
||||||
{yamlMode ? 'visual' : 'yaml'}
|
|
||||||
</button>}
|
|
||||||
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
|
||||||
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
|
||||||
</button>}
|
|
||||||
</div>
|
|
||||||
<div className={classes.children}>
|
|
||||||
{yamlMode && <InputYaml
|
|
||||||
label=""
|
|
||||||
value={condition}
|
|
||||||
onChange={update => onUpdate(update as any)}
|
|
||||||
/>}
|
|
||||||
<div className={classes.conditionWrap}>
|
|
||||||
{!yamlMode && childrenConditions}
|
|
||||||
</div>
|
|
||||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
|
||||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
|
||||||
</div>}
|
|
||||||
</div>
|
|
||||||
{children({ classes })}
|
|
||||||
</div>
|
|
||||||
}
|
}
|
||||||
|
// styles
|
||||||
|
let hasChildren = false;
|
||||||
|
if (condition.condition === "not") {
|
||||||
|
hasChildren = true;
|
||||||
|
} else if (condition.condition === "and") {
|
||||||
|
hasChildren = true;
|
||||||
|
} else if (condition.condition === "or") {
|
||||||
|
hasChildren = true;
|
||||||
|
}
|
||||||
|
const { classes } = useStyles({ hasChildren, isMobile });
|
||||||
|
|
||||||
|
// components
|
||||||
|
const DeleteButton = (p: { onClick?: () => void; isRoot?: boolean }) => (
|
||||||
|
<button
|
||||||
|
className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn}
|
||||||
|
onClick={p?.onClick}
|
||||||
|
>
|
||||||
|
X
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={classes.root}>
|
||||||
|
<>
|
||||||
|
{showDelete && !effectiveDM && (
|
||||||
|
<DeleteButton isRoot onClick={() => onDelete("root")} />
|
||||||
|
)}
|
||||||
|
<div className={classes.title}>
|
||||||
|
<InputList
|
||||||
|
label=""
|
||||||
|
className={classes.titleText}
|
||||||
|
current={condition.condition}
|
||||||
|
options={getSubTypeList("condition")}
|
||||||
|
onChange={(n: any) =>
|
||||||
|
onUpdate({
|
||||||
|
...getConditionDefaultValues(n),
|
||||||
|
...condition,
|
||||||
|
condition: n,
|
||||||
|
} as any)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
{effectiveDM && (
|
||||||
|
<button
|
||||||
|
className={classes.yamlBtn}
|
||||||
|
onClick={() => setYamlMode(!yamlMode)}
|
||||||
|
>
|
||||||
|
{yamlMode ? "visual" : "yaml"}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
{!yamlMode && (
|
||||||
|
<button
|
||||||
|
className={classes.modifyBtn}
|
||||||
|
onClick={() => setInternalDisplayMode(!effectiveDM)}
|
||||||
|
>
|
||||||
|
{effectiveDM ? (
|
||||||
|
<PencilIcon className={classes.icon} />
|
||||||
|
) : (
|
||||||
|
<CheckMarkIcon className={classes.icon} />
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className={classes.children}>
|
||||||
|
{yamlMode && (
|
||||||
|
<InputYaml
|
||||||
|
label=""
|
||||||
|
value={condition}
|
||||||
|
onChange={(update) => onUpdate(update as any)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<div className={classes.conditionWrap}>
|
||||||
|
{!yamlMode && childrenConditions}
|
||||||
|
</div>
|
||||||
|
{!yamlMode && hasChildren && (
|
||||||
|
<div className={classes.addBtnContainer}>
|
||||||
|
<button className={classes.addBtn} onClick={() => onAddChild()}>
|
||||||
|
Add
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{children({ classes })}
|
||||||
|
</>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,213 +1,324 @@
|
|||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
import {
|
||||||
|
AutomationCondition,
|
||||||
|
DeviceCondition,
|
||||||
|
LogicCondition,
|
||||||
|
NumericCondition,
|
||||||
|
StateCondition,
|
||||||
|
TemplateCondition,
|
||||||
|
TimeCondition,
|
||||||
|
TriggerCondition,
|
||||||
|
ZoneCondition,
|
||||||
|
} from "types/automations/conditions";
|
||||||
import InputNumber from "components/Inputs/InputNumber";
|
import InputNumber from "components/Inputs/InputNumber";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { InputEntity } from "components/Inputs/InputTextBubble";
|
import { InputEntity } from "components/Inputs/InputEntities";
|
||||||
import { ConditionNode } from "./ConditionNode";
|
import { ConditionNode } from "./ConditionNode";
|
||||||
import { genUpdateMethods } from "./nestedUpdater";
|
import { genUpdateMethods } from "./nestedUpdater";
|
||||||
import InputTime from "components/Inputs/InputTime";
|
import { InputTime } from "components/Inputs/InputTime";
|
||||||
import InputYaml from "components/Inputs/InputYaml";
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
import { HAService } from "haService";
|
||||||
|
import { DeviceEditor } from "components/DeviceEditor";
|
||||||
|
|
||||||
|
interface Editor<C extends AutomationCondition>
|
||||||
interface Editor<C extends AutomationCondition> extends FC<{
|
extends FC<{
|
||||||
condition: C,
|
condition: C;
|
||||||
onChange: (condition: C) => void;
|
onChange: (condition: C) => void;
|
||||||
}> { }
|
ha: HAService;
|
||||||
|
}> {}
|
||||||
|
|
||||||
export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
||||||
switch (condition.condition) {
|
switch (condition.condition) {
|
||||||
case 'template':
|
case "template":
|
||||||
return TemplateEditor;
|
return TemplateEditor;
|
||||||
case 'and':
|
case "and":
|
||||||
return LogicViewer;
|
return LogicViewer;
|
||||||
case 'or':
|
case "or":
|
||||||
return LogicViewer;
|
return LogicViewer;
|
||||||
case 'not':
|
case "not":
|
||||||
return LogicViewer;
|
return LogicViewer;
|
||||||
case 'numeric_state':
|
case "device":
|
||||||
|
return DeviceConditionEditor;
|
||||||
|
case "numeric_state":
|
||||||
return NumericStateEditor;
|
return NumericStateEditor;
|
||||||
case 'state':
|
case "state":
|
||||||
return StateEditor;
|
return StateEditor;
|
||||||
case 'time':
|
case "time":
|
||||||
return TimeEditor;
|
return TimeEditor;
|
||||||
case 'trigger':
|
case "trigger":
|
||||||
return TriggerEditor;
|
return TriggerEditor;
|
||||||
case 'zone':
|
case "zone":
|
||||||
return ZoneEditor;
|
return ZoneEditor;
|
||||||
default:
|
default:
|
||||||
return () => <div>Not Ready</div>
|
return () => <div>Not Ready</div>;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export const TemplateEditor: Editor<TemplateCondition> = ({
|
export const TemplateEditor: Editor<TemplateCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
<InputYaml label="Template" value={condition.value_template} onChange={value_template => onChange({
|
<>
|
||||||
...condition,
|
<InputYaml
|
||||||
value_template
|
label="Template"
|
||||||
})} />
|
value={condition.value_template}
|
||||||
</>
|
onChange={(value_template) =>
|
||||||
}
|
onChange({
|
||||||
|
...condition,
|
||||||
|
value_template,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const DeviceConditionEditor: Editor<DeviceCondition> = ({
|
||||||
|
onChange,
|
||||||
|
condition,
|
||||||
|
ha: {
|
||||||
|
deviceExtras: { useDeviceConditionCapalities, useDeviceConditions },
|
||||||
|
},
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<DeviceEditor
|
||||||
|
type="condition"
|
||||||
|
state={condition}
|
||||||
|
setState={(data) =>
|
||||||
|
onChange({
|
||||||
|
condition: "device",
|
||||||
|
...data,
|
||||||
|
} as any)
|
||||||
|
}
|
||||||
|
options={useDeviceConditions(
|
||||||
|
condition.device_id
|
||||||
|
? {
|
||||||
|
deviceId: condition.device_id,
|
||||||
|
}
|
||||||
|
: undefined
|
||||||
|
)}
|
||||||
|
caps={useDeviceConditionCapalities(condition as any)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const NumericStateEditor: Editor<NumericCondition> = ({
|
export const NumericStateEditor: Editor<NumericCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
<InputEntity
|
<>
|
||||||
value={condition.entity_id}
|
<InputEntity
|
||||||
onChange={entity_id => onChange({
|
value={condition.entity_id}
|
||||||
...condition,
|
multiple
|
||||||
entity_id
|
onChange={(entity_id) =>
|
||||||
})}
|
onChange({
|
||||||
/>
|
...condition,
|
||||||
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
|
entity_id,
|
||||||
...condition,
|
})
|
||||||
attribute
|
}
|
||||||
})} />
|
/>
|
||||||
<InputNumber
|
<InputText
|
||||||
label="Above"
|
label="Attribute"
|
||||||
value={condition.above ? Number(condition.above) : undefined}
|
value={condition.attribute ?? ""}
|
||||||
onChange={above => onChange({
|
onChange={(attribute) =>
|
||||||
...condition,
|
onChange({
|
||||||
above: above ? String(above) : undefined,
|
...condition,
|
||||||
})}
|
attribute,
|
||||||
/>
|
})
|
||||||
<InputNumber
|
}
|
||||||
label="Below"
|
/>
|
||||||
value={condition.below ? Number(condition.below) : undefined}
|
<InputNumber
|
||||||
onChange={below => onChange({
|
label="Above"
|
||||||
...condition,
|
value={condition.above ? Number(condition.above) : undefined}
|
||||||
below: below ? String(below) : undefined,
|
onChange={(above) =>
|
||||||
})}
|
onChange({
|
||||||
/>
|
...condition,
|
||||||
<InputYaml label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
|
above: above ? String(above) : undefined,
|
||||||
...condition,
|
})
|
||||||
value_template
|
}
|
||||||
})} />
|
/>
|
||||||
</>
|
<InputNumber
|
||||||
}
|
label="Below"
|
||||||
|
value={condition.below ? Number(condition.below) : undefined}
|
||||||
|
onChange={(below) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
below: below ? String(below) : undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<InputYaml
|
||||||
|
label="Template"
|
||||||
|
value={condition.value_template ?? ""}
|
||||||
|
onChange={(value_template) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
value_template,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const LogicViewer: Editor<LogicCondition> = ({
|
export const LogicViewer: Editor<LogicCondition> = ({
|
||||||
condition,
|
condition,
|
||||||
onChange,
|
onChange,
|
||||||
}) => {
|
}) => {
|
||||||
|
return (
|
||||||
return <>
|
<>
|
||||||
{condition.conditions.map((c, i) => {
|
{condition.conditions.map((c, i) => {
|
||||||
return <ConditionNode
|
return (
|
||||||
key={i}
|
<ConditionNode
|
||||||
condition={c}
|
key={i}
|
||||||
displayMode={false}
|
condition={c}
|
||||||
{...genUpdateMethods(condition, onChange)(i)}
|
displayMode={false}
|
||||||
showDelete
|
{...genUpdateMethods(condition, onChange)(i)}
|
||||||
/>
|
showDelete
|
||||||
})}
|
/>
|
||||||
</>
|
);
|
||||||
}
|
})}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const StateEditor: Editor<StateCondition> = ({
|
export const StateEditor: Editor<StateCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
<InputEntity
|
<>
|
||||||
value={condition.entity_id}
|
<InputEntity
|
||||||
onChange={entity_id => onChange({
|
value={condition.entity_id}
|
||||||
...condition,
|
multiple
|
||||||
entity_id
|
onChange={(entity_id) =>
|
||||||
})}
|
onChange({
|
||||||
/>
|
...condition,
|
||||||
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
|
entity_id,
|
||||||
...condition,
|
})
|
||||||
attribute
|
}
|
||||||
})} />
|
/>
|
||||||
<InputText
|
<InputText
|
||||||
label="State"
|
label="Attribute"
|
||||||
value={String(condition.state)}
|
value={condition.attribute ?? ""}
|
||||||
onChange={state => onChange({
|
onChange={(attribute) =>
|
||||||
...condition,
|
onChange({
|
||||||
state,
|
...condition,
|
||||||
})}
|
attribute,
|
||||||
/>
|
})
|
||||||
<InputTime
|
}
|
||||||
label="For"
|
/>
|
||||||
value={condition.for}
|
<InputText
|
||||||
onChange={_for => onChange({
|
label="State"
|
||||||
...condition,
|
value={String(condition.state)}
|
||||||
for: _for,
|
onChange={(state) =>
|
||||||
})}
|
onChange({
|
||||||
/>
|
...condition,
|
||||||
</>
|
state,
|
||||||
}
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<InputTime
|
||||||
|
label="For"
|
||||||
|
value={condition.for}
|
||||||
|
onChange={(_for) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
for: _for,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const TimeEditor: Editor<TimeCondition> = ({
|
export const TimeEditor: Editor<TimeCondition> = ({ onChange, condition }) => {
|
||||||
onChange,
|
return (
|
||||||
condition,
|
<>
|
||||||
}) => {
|
<InputTime
|
||||||
return <>
|
label="After"
|
||||||
<InputTime
|
value={condition.after}
|
||||||
label="After"
|
onChange={(after) =>
|
||||||
value={condition.after}
|
onChange({
|
||||||
onChange={after => onChange({
|
...condition,
|
||||||
...condition,
|
after,
|
||||||
after,
|
})
|
||||||
})}
|
}
|
||||||
/>
|
/>
|
||||||
<InputTime
|
<InputTime
|
||||||
label="Before"
|
label="Before"
|
||||||
value={condition.before}
|
value={condition.before}
|
||||||
onChange={before => onChange({
|
onChange={(before) =>
|
||||||
...condition,
|
onChange({
|
||||||
before,
|
...condition,
|
||||||
})}
|
before,
|
||||||
/>
|
})
|
||||||
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
}
|
||||||
</>
|
/>
|
||||||
}
|
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const TriggerEditor: Editor<TriggerCondition> = ({
|
export const TriggerEditor: Editor<TriggerCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
|
<>
|
||||||
...condition,
|
<InputText
|
||||||
id
|
label="Trigger ID"
|
||||||
})} />
|
value={condition.id}
|
||||||
</>
|
onChange={(id) =>
|
||||||
}
|
onChange({
|
||||||
|
...condition,
|
||||||
|
id,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const ZoneEditor: Editor<ZoneCondition> = ({
|
export const ZoneEditor: Editor<ZoneCondition> = ({ onChange, condition }) => {
|
||||||
onChange,
|
return (
|
||||||
condition,
|
<>
|
||||||
}) => {
|
<InputEntity
|
||||||
return <>
|
label="Zone"
|
||||||
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
|
value={condition.zone}
|
||||||
...condition,
|
multiple={false}
|
||||||
zone
|
onChange={(zone) =>
|
||||||
})} />
|
onChange({
|
||||||
<InputEntity
|
...condition,
|
||||||
value={condition.entity_id}
|
zone: zone ?? "",
|
||||||
onChange={entity_id => onChange({
|
})
|
||||||
...condition,
|
}
|
||||||
entity_id
|
restrictToDomain={["zone"]}
|
||||||
})}
|
/>
|
||||||
/>
|
<InputEntity
|
||||||
<InputText
|
label="Entity with Location"
|
||||||
label="State"
|
value={condition.entity_id}
|
||||||
value={String(condition.state)}
|
multiple
|
||||||
onChange={state => onChange({
|
onChange={(entity_id) =>
|
||||||
...condition,
|
onChange({
|
||||||
state,
|
...condition,
|
||||||
})}
|
entity_id,
|
||||||
/>
|
})
|
||||||
</>
|
}
|
||||||
}
|
restrictToDomain={["person", "device_tracker"]}
|
||||||
|
/>
|
||||||
|
<InputText
|
||||||
|
label="State"
|
||||||
|
value={String(condition.state)}
|
||||||
|
onChange={(state) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
state,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -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',
|
||||||
|
|||||||
@@ -1,43 +1,53 @@
|
|||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
|
import {
|
||||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
AutomationCondition,
|
||||||
|
LogicCondition,
|
||||||
|
} from "types/automations/conditions";
|
||||||
|
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
|
||||||
import { ConditionNode } from "./ConditionNode";
|
import { ConditionNode } from "./ConditionNode";
|
||||||
import { genUpdateMethods } from "./nestedUpdater";
|
import { genUpdateMethods } from "./nestedUpdater";
|
||||||
|
|
||||||
|
interface Viewer<C extends AutomationCondition>
|
||||||
interface Viewer<C extends AutomationCondition> extends FC<{
|
extends FC<{
|
||||||
condition: C;
|
condition: C;
|
||||||
onChange: (condition: C) => void;
|
namer: Namer;
|
||||||
}> { }
|
onChange: (condition: C) => void;
|
||||||
|
}> {}
|
||||||
|
|
||||||
export const getViewer = (condition: AutomationCondition): Viewer<any> => {
|
export const getViewer = (condition: AutomationCondition): Viewer<any> => {
|
||||||
if (
|
if (
|
||||||
(condition.condition === 'and') ||
|
condition.condition === "and" ||
|
||||||
(condition.condition === 'or') ||
|
condition.condition === "or" ||
|
||||||
(condition.condition === 'not')
|
condition.condition === "not"
|
||||||
) {
|
) {
|
||||||
return LogicViewer
|
return LogicViewer;
|
||||||
}
|
}
|
||||||
return GenericViewer
|
return GenericViewer;
|
||||||
}
|
};
|
||||||
|
|
||||||
export const GenericViewer: Viewer<AutomationCondition> = ({
|
export const GenericViewer: Viewer<AutomationCondition> = ({
|
||||||
condition,
|
condition,
|
||||||
|
namer,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return <>{getDescriptionFromAutomationNode(condition, namer, true)}</>;
|
||||||
{getDescriptionFromAutomationNode(condition)}
|
};
|
||||||
</>
|
|
||||||
}
|
|
||||||
|
|
||||||
export const LogicViewer: Viewer<LogicCondition> = ({
|
export const LogicViewer: Viewer<LogicCondition> = ({
|
||||||
condition,
|
condition,
|
||||||
onChange,
|
onChange,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
{condition.conditions.map((c, i) => {
|
<>
|
||||||
return <ConditionNode key={i} condition={c} displayMode
|
{condition.conditions.map((c, i) => {
|
||||||
{...genUpdateMethods(condition, onChange)(i)}
|
return (
|
||||||
/>
|
<ConditionNode
|
||||||
})}
|
key={i}
|
||||||
</>
|
condition={c}
|
||||||
}
|
displayMode
|
||||||
|
{...genUpdateMethods(condition, onChange)(i)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -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 ?
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -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,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -92,7 +92,10 @@ Complex.args = {
|
|||||||
{
|
{
|
||||||
"platform": "homeassistant",
|
"platform": "homeassistant",
|
||||||
"event": "start",
|
"event": "start",
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
"bad": "node"
|
||||||
|
} as any
|
||||||
],
|
],
|
||||||
sequence: [
|
sequence: [
|
||||||
{
|
{
|
||||||
@@ -120,6 +123,9 @@ Complex.args = {
|
|||||||
"media_content_type": "SPOTIFY"
|
"media_content_type": "SPOTIFY"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"alias": "Bad Node",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"choose": [
|
"choose": [
|
||||||
{
|
{
|
||||||
@@ -231,4 +237,27 @@ Errors.args = {
|
|||||||
"choose": {}
|
"choose": {}
|
||||||
} as any
|
} as any
|
||||||
]
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const ComplexFlipped = Complex.bind({})
|
||||||
|
|
||||||
|
ComplexFlipped.args = {
|
||||||
|
...Complex.args,
|
||||||
|
dims: {
|
||||||
|
...dgconst.DEFAULT_DIMS,
|
||||||
|
...Complex.args.dims,
|
||||||
|
flipped: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const SimpleFlipped = Simple.bind({})
|
||||||
|
|
||||||
|
SimpleFlipped.args = {
|
||||||
|
...Simple.args,
|
||||||
|
dims: {
|
||||||
|
...dgconst.DEFAULT_DIMS,
|
||||||
|
...Complex.args.dims,
|
||||||
|
flipped: true,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,17 @@
|
|||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
|
|
||||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
import ReactFlow, { Controls } from "react-flow-renderer";
|
||||||
import { AutomationSequenceNode } from "types/automations";
|
import { AutomationSequenceNode } from "types/automations";
|
||||||
import { AutomationTrigger } from 'types/automations/triggers';
|
import { AutomationTrigger } from "types/automations/triggers";
|
||||||
import { triggerToFlow } from "./triggerConvertor";
|
import { triggerToFlow } from "./triggerConvertor";
|
||||||
import { DAGNode } from "./DAGNode";
|
import { DAGNode } from "./DAGNode";
|
||||||
import { DAGAutomationFlowDims, FlowData, ModalState, UpdateModalState } from './types';
|
import {
|
||||||
import { DAGCircle } from './DAGCircle';
|
DAGAutomationFlowDims,
|
||||||
|
FlowData,
|
||||||
|
ModalState,
|
||||||
|
UpdateModalState,
|
||||||
|
} from "./types";
|
||||||
|
import { DAGCircle } from "./DAGCircle";
|
||||||
import { sequenceToFlow } from "./sequenceConvertor";
|
import { sequenceToFlow } from "./sequenceConvertor";
|
||||||
import { makeSequenceUpdater } from "./updater";
|
import { makeSequenceUpdater } from "./updater";
|
||||||
import { NodeEditor } from "components/NodeEditor";
|
import { NodeEditor } from "components/NodeEditor";
|
||||||
@@ -16,132 +21,170 @@ import { AutomationCondition } from "types/automations/conditions";
|
|||||||
import { makeConditionPoint } from "./flowDataMods";
|
import { makeConditionPoint } from "./flowDataMods";
|
||||||
import { convertToFlowNode } from "./helpers";
|
import { convertToFlowNode } from "./helpers";
|
||||||
import { DAGErrorNode } from "./DAGErrorNode";
|
import { DAGErrorNode } from "./DAGErrorNode";
|
||||||
|
import { useHA } from "haService";
|
||||||
|
|
||||||
const nodeTypes = {
|
const nodeTypes = {
|
||||||
'dagnode': convertToFlowNode(DAGNode),
|
dagnode: convertToFlowNode(DAGNode),
|
||||||
'errornode': convertToFlowNode(DAGErrorNode),
|
errornode: convertToFlowNode(DAGErrorNode),
|
||||||
'dagcircle': DAGCircle,
|
dagcircle: DAGCircle,
|
||||||
}
|
};
|
||||||
|
|
||||||
const makeOnEditAutomationConditions = (
|
const makeOnEditAutomationConditions =
|
||||||
|
(
|
||||||
conditions: AutomationCondition[],
|
conditions: AutomationCondition[],
|
||||||
updateConditions: (c: AutomationCondition[]) => void,
|
updateConditions: (c: AutomationCondition[]) => void,
|
||||||
openModal: UpdateModalState,
|
openModal: UpdateModalState
|
||||||
) => () => openModal({
|
) =>
|
||||||
single: false,
|
() =>
|
||||||
node: conditions,
|
openModal({
|
||||||
allowedTypes: ['condition'],
|
single: false,
|
||||||
update: c => updateConditions(c as any),
|
node: conditions,
|
||||||
})
|
allowedTypes: ["condition"],
|
||||||
|
update: (c) => updateConditions(c as any),
|
||||||
|
});
|
||||||
|
|
||||||
export interface DAGAutomationFlowProps {
|
export interface DAGAutomationFlowProps {
|
||||||
className?: string;
|
className?: string;
|
||||||
trigger: AutomationTrigger[];
|
trigger: AutomationTrigger[];
|
||||||
condition: AutomationCondition[];
|
condition: AutomationCondition[];
|
||||||
sequence: AutomationSequenceNode[];
|
sequence: AutomationSequenceNode[];
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGAutomationFlowDims;
|
||||||
onTriggerUpdate: (t: AutomationTrigger[]) => void;
|
onTriggerUpdate: (t: AutomationTrigger[]) => void;
|
||||||
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
|
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
|
||||||
onConditionUpdate: (s: AutomationCondition[]) => void;
|
onConditionUpdate: (s: AutomationCondition[]) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
||||||
className,
|
className,
|
||||||
trigger,
|
trigger,
|
||||||
condition,
|
condition,
|
||||||
sequence,
|
sequence,
|
||||||
onTriggerUpdate,
|
onTriggerUpdate,
|
||||||
onSequenceUpdate,
|
onSequenceUpdate,
|
||||||
onConditionUpdate,
|
onConditionUpdate,
|
||||||
dims,
|
dims,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [modalState, setModalState] = useState<ModalState | null>(null);
|
const [modalState, setModalState] = useState<ModalState | null>(null);
|
||||||
|
const { namer } = useHA();
|
||||||
|
// modal
|
||||||
|
let modalBody = <></>;
|
||||||
|
if (modalState) {
|
||||||
|
if (modalState.single) {
|
||||||
|
modalBody = (
|
||||||
|
<NodeEditor
|
||||||
|
node={modalState.node}
|
||||||
|
isErrored={modalState.isError}
|
||||||
|
onClose={() => setModalState(null)}
|
||||||
|
onSave={(n) => {
|
||||||
|
modalState.update(n as any);
|
||||||
|
setModalState(null);
|
||||||
|
}}
|
||||||
|
allowedTypes={modalState.allowedTypes}
|
||||||
|
saveBtnCreateText={modalState.saveBtnCreateText}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
modalBody = (
|
||||||
|
<MultiNodeEditor
|
||||||
|
sequence={modalState.node}
|
||||||
|
onClose={() => setModalState(null)}
|
||||||
|
onSave={(n) => modalState.update(n as any)}
|
||||||
|
allowedTypes={["condition"]}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// modal
|
// convert automation to flow data
|
||||||
let modalBody = <></>
|
const condPoint = makeConditionPoint(
|
||||||
if (modalState) {
|
"c",
|
||||||
if (modalState.single) {
|
dims.flipped
|
||||||
modalBody = <NodeEditor
|
? {
|
||||||
node={modalState.node}
|
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
isErrored={modalState.isError}
|
x: dims.padding.x + dims.nodeWidth * 0.25,
|
||||||
onClose={() => setModalState(null)}
|
|
||||||
onSave={n => { modalState.update(n as any); setModalState(null); }}
|
|
||||||
allowedTypes={modalState.allowedTypes}
|
|
||||||
saveBtnCreateText={modalState.saveBtnCreateText}
|
|
||||||
/>
|
|
||||||
} else {
|
|
||||||
modalBody = <MultiNodeEditor
|
|
||||||
sequence={modalState.node}
|
|
||||||
onClose={() => setModalState(null)}
|
|
||||||
onSave={(n) => modalState.update(n as any)}
|
|
||||||
allowedTypes={['condition']}
|
|
||||||
/>
|
|
||||||
}
|
}
|
||||||
}
|
: {
|
||||||
|
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
// convert automation to flow data
|
y: dims.padding.y + dims.nodeHeight * 0.25,
|
||||||
const condPoint = makeConditionPoint('c', {
|
|
||||||
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
|
|
||||||
y: dims.padding.y + dims.nodeHeight * 0.25
|
|
||||||
}, dims, condition.length, makeOnEditAutomationConditions(
|
|
||||||
condition,
|
|
||||||
onConditionUpdate,
|
|
||||||
setModalState,
|
|
||||||
));
|
|
||||||
const flowData: FlowData = {
|
|
||||||
nodes: [condPoint],
|
|
||||||
edges: [],
|
|
||||||
}
|
|
||||||
triggerToFlow(flowData, trigger, condPoint.id, dims, {
|
|
||||||
onAdd: () => onTriggerUpdate([
|
|
||||||
...trigger, {
|
|
||||||
platform: 'event',
|
|
||||||
event_type: '',
|
|
||||||
}
|
|
||||||
]),
|
|
||||||
onDelete: i => onTriggerUpdate([
|
|
||||||
...trigger.slice(0, i),
|
|
||||||
...trigger.slice(i + 1)
|
|
||||||
]),
|
|
||||||
onEdit: i => setModalState({
|
|
||||||
single: true,
|
|
||||||
node: trigger[i],
|
|
||||||
update: t => onTriggerUpdate([
|
|
||||||
...trigger.slice(0, i),
|
|
||||||
t,
|
|
||||||
...trigger.slice(i + 1)
|
|
||||||
]),
|
|
||||||
allowedTypes: ['trigger'],
|
|
||||||
})
|
|
||||||
});
|
|
||||||
sequenceToFlow(
|
|
||||||
flowData,
|
|
||||||
sequence,
|
|
||||||
condPoint.id,
|
|
||||||
{
|
|
||||||
...dims, padding: {
|
|
||||||
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
|
|
||||||
y: dims.padding.y,
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
dims,
|
||||||
);
|
condition.length,
|
||||||
// render
|
makeOnEditAutomationConditions(condition, onConditionUpdate, setModalState)
|
||||||
return <>
|
);
|
||||||
<Modal open={!!modalState}>
|
const flowData: FlowData = {
|
||||||
{modalBody}
|
nodes: [condPoint],
|
||||||
</Modal>
|
edges: [],
|
||||||
<ReactFlow
|
};
|
||||||
className={className}
|
triggerToFlow(flowData, trigger, condPoint.id, dims, {
|
||||||
nodeTypes={nodeTypes}
|
namer,
|
||||||
snapToGrid
|
onAdd: () =>
|
||||||
onlyRenderVisibleElements
|
setModalState({
|
||||||
nodesConnectable={false}
|
single: true,
|
||||||
nodesDraggable={false}
|
saveBtnCreateText: true,
|
||||||
{...flowData}
|
node: {
|
||||||
>
|
platform: "device",
|
||||||
<Controls />
|
},
|
||||||
</ReactFlow>
|
update: (n) => {
|
||||||
</>;
|
onTriggerUpdate([...trigger, n]);
|
||||||
}
|
},
|
||||||
|
allowedTypes: ["trigger"],
|
||||||
|
}),
|
||||||
|
onDelete: (i) =>
|
||||||
|
onTriggerUpdate([...trigger.slice(0, i), ...trigger.slice(i + 1)]),
|
||||||
|
onEdit: (i) =>
|
||||||
|
setModalState({
|
||||||
|
single: true,
|
||||||
|
node: trigger[i],
|
||||||
|
update: (t) =>
|
||||||
|
onTriggerUpdate([...trigger.slice(0, i), t, ...trigger.slice(i + 1)]),
|
||||||
|
allowedTypes: ["trigger"],
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
sequenceToFlow(
|
||||||
|
flowData,
|
||||||
|
sequence,
|
||||||
|
condPoint.id,
|
||||||
|
{
|
||||||
|
...dims,
|
||||||
|
padding: dims.flipped
|
||||||
|
? {
|
||||||
|
y: condPoint.position.y - dims.nodeHeight - dims.conditionHeight,
|
||||||
|
x: dims.padding.x,
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
|
||||||
|
y: dims.padding.y,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
namer,
|
||||||
|
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState)
|
||||||
|
);
|
||||||
|
// this fixes some strange edge drawing issue
|
||||||
|
flowData.edges = flowData.edges.map((e) => ({
|
||||||
|
...e,
|
||||||
|
source: `${e.source}-${dims.flipped}`,
|
||||||
|
target: `${e.target}-${dims.flipped}`,
|
||||||
|
}));
|
||||||
|
flowData.nodes = flowData.nodes.map((n) => ({
|
||||||
|
...n,
|
||||||
|
id: `${n.id}-${dims.flipped}`,
|
||||||
|
}));
|
||||||
|
// render
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Modal open={!!modalState}>{modalBody}</Modal>
|
||||||
|
<ReactFlow
|
||||||
|
className={className}
|
||||||
|
nodeTypes={nodeTypes}
|
||||||
|
snapToGrid
|
||||||
|
onlyRenderVisibleElements
|
||||||
|
nodesConnectable={false}
|
||||||
|
nodesDraggable={false}
|
||||||
|
{...flowData}
|
||||||
|
>
|
||||||
|
<Controls />
|
||||||
|
</ReactFlow>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,266 +1,380 @@
|
|||||||
import { AutomationSequenceNode } from 'types/automations';
|
import { AutomationSequenceNode } from "types/automations";
|
||||||
import { DAGAutomationFlowDims, FlowData } from './types';
|
import { DAGAutomationFlowDims, FlowData } from "./types";
|
||||||
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
|
||||||
import { XYPosition } from 'react-flow-renderer';
|
import { XYPosition } from "react-flow-renderer";
|
||||||
import { ChooseAction } from 'types/automations/actions';
|
import { ChooseAction } from "types/automations/actions";
|
||||||
import { makeFlowCircle } from './DAGCircle';
|
import { makeFlowCircle } from "./DAGCircle";
|
||||||
import { createOnRemoveForChooseNode, SequenceUpdater } from './updater';
|
import { createOnRemoveForChooseNode, SequenceUpdater } from "./updater";
|
||||||
import { getNodeType } from 'utils/automations';
|
import { getNodeType } from "utils/automations";
|
||||||
import { makeAddButton, makeConditionPoint } from './flowDataMods';
|
import { makeAddButton, makeConditionPoint } from "./flowDataMods";
|
||||||
|
|
||||||
|
|
||||||
export const sequenceToFlow = (
|
export const sequenceToFlow = (
|
||||||
flowData: FlowData,
|
flowData: FlowData,
|
||||||
sequence: AutomationSequenceNode[],
|
sequence: AutomationSequenceNode[],
|
||||||
fromPoint: string,
|
fromPoint: string,
|
||||||
dims: DAGAutomationFlowDims,
|
dims: DAGAutomationFlowDims,
|
||||||
updater: SequenceUpdater,
|
namer: Namer,
|
||||||
prefix: string = "",
|
updater: SequenceUpdater,
|
||||||
|
prefix: string = ""
|
||||||
) => {
|
) => {
|
||||||
let lastPointId = fromPoint;
|
let lastPointId = fromPoint;
|
||||||
let lasPos: XYPosition | null = null;
|
let lasPos: XYPosition | null = null;
|
||||||
// sequence
|
// sequence
|
||||||
for (let i = 0; i < sequence.length; i++) {
|
for (let i = 0; i < sequence.length; i++) {
|
||||||
const node = sequence[i];
|
const node = sequence[i];
|
||||||
const nodeId = `${prefix}n-${i}`;
|
const nodeId = `${prefix}n-${i}`;
|
||||||
let position: XYPosition;
|
let position: XYPosition;
|
||||||
if (lasPos) {
|
if (lasPos) {
|
||||||
position = {
|
position = dims.flipped
|
||||||
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
|
? {
|
||||||
y: dims.padding.y
|
y: lasPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
}
|
x: dims.padding.x,
|
||||||
} else {
|
}
|
||||||
position = {
|
: {
|
||||||
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
|
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
y: dims.padding.y
|
y: dims.padding.y,
|
||||||
};
|
};
|
||||||
}
|
} else {
|
||||||
// draw node
|
position = dims.flipped
|
||||||
if (getNodeType(node) === 'action') {
|
? {
|
||||||
if ('choose' in node) {
|
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor * (i + 2),
|
||||||
try {
|
x: dims.padding.x,
|
||||||
const out = addChooseNode(node, position, nodeId, dims, updater, i);
|
}
|
||||||
position = out.lastPos
|
: {
|
||||||
flowData = mergeFlowDatas(flowData, out.flowData);
|
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
|
||||||
} catch (err) {
|
y: dims.padding.y,
|
||||||
console.error(err)
|
};
|
||||||
addErrorNode(flowData, nodeId, position, dims, err, updater.makeOnEditForBadNode(i));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
|
||||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
|
||||||
onXClick: () => updater.removeNode(i)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
|
||||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
|
||||||
onXClick: () => updater.removeNode(i)
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
addEdge(flowData, lastPointId, nodeId, false)
|
|
||||||
lastPointId = nodeId;
|
|
||||||
lasPos = position;
|
|
||||||
}
|
}
|
||||||
|
// draw node
|
||||||
|
if (getNodeType(node) === "action") {
|
||||||
|
if ("choose" in node) {
|
||||||
|
try {
|
||||||
|
const out = addChooseNode(
|
||||||
|
node,
|
||||||
|
position,
|
||||||
|
nodeId,
|
||||||
|
dims,
|
||||||
|
namer,
|
||||||
|
updater,
|
||||||
|
i
|
||||||
|
);
|
||||||
|
position = out.lastPos;
|
||||||
|
flowData = mergeFlowDatas(flowData, out.flowData);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
addErrorNode(
|
||||||
|
flowData,
|
||||||
|
nodeId,
|
||||||
|
position,
|
||||||
|
dims,
|
||||||
|
err,
|
||||||
|
updater.makeOnEditForBadNode(i)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
|
onXClick: () => updater.removeNode(i),
|
||||||
|
namer,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
|
onXClick: () => updater.removeNode(i),
|
||||||
|
namer,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
addEdge(flowData, lastPointId, nodeId, false);
|
||||||
|
lastPointId = nodeId;
|
||||||
|
lasPos = position;
|
||||||
|
}
|
||||||
|
|
||||||
// add button
|
// add button
|
||||||
const addCircle = makeAddButton(
|
const addCircle = makeAddButton(
|
||||||
`${prefix}-+`,
|
`${prefix}-+`,
|
||||||
{
|
dims.flipped
|
||||||
x: (
|
? {
|
||||||
lasPos === null ?
|
y:
|
||||||
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
|
(lasPos === null
|
||||||
lasPos.x
|
? dims.padding.y +
|
||||||
) + dims.nodeWidth * dims.distanceFactor,
|
dims.nodeHeight * dims.distanceFactor * (sequence.length + 1)
|
||||||
y: dims.padding.y + dims.circleSize / 4
|
: lasPos.y) +
|
||||||
|
dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: dims.padding.x + dims.circleSize * 1.5,
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
x:
|
||||||
|
(lasPos === null
|
||||||
|
? dims.padding.x +
|
||||||
|
dims.nodeWidth * dims.distanceFactor * (sequence.length + 1)
|
||||||
|
: lasPos.x) +
|
||||||
|
dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: dims.padding.y + dims.circleSize / 4,
|
||||||
},
|
},
|
||||||
dims,
|
dims,
|
||||||
updater.addNode,
|
updater.addNode,
|
||||||
false,
|
false
|
||||||
)
|
);
|
||||||
flowData.nodes.push(addCircle)
|
flowData.nodes.push(addCircle);
|
||||||
addEdge(flowData, lastPointId, addCircle.id, false)
|
addEdge(flowData, lastPointId, addCircle.id, false);
|
||||||
return {
|
return {
|
||||||
position: lasPos,
|
position: lasPos,
|
||||||
pointId: lastPointId,
|
pointId: lastPointId,
|
||||||
};
|
};
|
||||||
}
|
};
|
||||||
|
|
||||||
const xyApply = (p1: XYPosition, p2: XYPosition, fcn: (a: number, b: number) => number): XYPosition => ({
|
const xyApply = (
|
||||||
x: fcn(p1.x, p2.x), y: fcn(p1.y, p2.y)
|
p1: XYPosition,
|
||||||
})
|
p2: XYPosition,
|
||||||
|
fcn: (a: number, b: number) => number
|
||||||
|
): XYPosition => ({
|
||||||
|
x: fcn(p1.x, p2.x),
|
||||||
|
y: fcn(p1.y, p2.y),
|
||||||
|
});
|
||||||
|
|
||||||
const addEdge = (flowData: FlowData, source: string, target: string, animated: boolean = false) => flowData.edges.push({
|
const addEdge = (
|
||||||
|
flowData: FlowData,
|
||||||
|
source: string,
|
||||||
|
target: string,
|
||||||
|
animated: boolean = false
|
||||||
|
) =>
|
||||||
|
flowData.edges.push({
|
||||||
id: `${source}-${target}`,
|
id: `${source}-${target}`,
|
||||||
source,
|
source,
|
||||||
target,
|
target,
|
||||||
animated,
|
animated,
|
||||||
})
|
});
|
||||||
|
|
||||||
const addSingleNode = (
|
const addSingleNode = (
|
||||||
flowData: FlowData,
|
flowData: FlowData,
|
||||||
node: AutomationSequenceNode,
|
node: AutomationSequenceNode,
|
||||||
position: XYPosition,
|
position: XYPosition,
|
||||||
nodeId: string,
|
nodeId: string,
|
||||||
{
|
{ flipped, nodeHeight, nodeWidth }: DAGAutomationFlowDims,
|
||||||
nodeHeight,
|
opts: {
|
||||||
nodeWidth,
|
onEditClick: () => void;
|
||||||
}: DAGAutomationFlowDims,
|
onXClick: () => void;
|
||||||
opts: {
|
namer: Namer;
|
||||||
onEditClick: () => void;
|
}
|
||||||
onXClick: () => void;
|
) =>
|
||||||
}
|
flowData.nodes.push({
|
||||||
) => flowData.nodes.push({
|
|
||||||
id: nodeId,
|
id: nodeId,
|
||||||
type: 'dagnode',
|
type: "dagnode",
|
||||||
data: {
|
data: {
|
||||||
label: getDescriptionFromAutomationNode(node),
|
label: getDescriptionFromAutomationNode(node, opts.namer, true),
|
||||||
height: nodeHeight,
|
height: nodeHeight,
|
||||||
width: nodeWidth,
|
width: nodeWidth,
|
||||||
color: getNodeType(node) === 'action' ? 'green' : 'blue',
|
color: getNodeType(node) === "action" ? "green" : "blue",
|
||||||
hasInput: true,
|
hasInput: true,
|
||||||
...opts,
|
flipped,
|
||||||
|
...opts,
|
||||||
},
|
},
|
||||||
position,
|
position,
|
||||||
});
|
});
|
||||||
|
|
||||||
const addErrorNode = (
|
const addErrorNode = (
|
||||||
flowData: FlowData,
|
flowData: FlowData,
|
||||||
nodeId: string,
|
nodeId: string,
|
||||||
position: XYPosition,
|
position: XYPosition,
|
||||||
{
|
{ nodeHeight, nodeWidth }: DAGAutomationFlowDims,
|
||||||
nodeHeight,
|
error: any,
|
||||||
nodeWidth,
|
onEdit: () => void,
|
||||||
}: DAGAutomationFlowDims,
|
hasInput: boolean = true
|
||||||
error: any,
|
) =>
|
||||||
onEdit: () => void,
|
flowData.nodes.push({
|
||||||
hasInput: boolean = true,
|
|
||||||
) => flowData.nodes.push({
|
|
||||||
id: nodeId,
|
id: nodeId,
|
||||||
type: 'errornode',
|
type: "errornode",
|
||||||
position,
|
position,
|
||||||
data: {
|
data: {
|
||||||
height: nodeHeight,
|
height: nodeHeight,
|
||||||
width: nodeWidth,
|
width: nodeWidth,
|
||||||
hasInput,
|
hasInput,
|
||||||
onEdit,
|
onEdit,
|
||||||
error,
|
error,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const addChooseNode = (
|
const addChooseNode = (
|
||||||
node: ChooseAction,
|
node: ChooseAction,
|
||||||
position: XYPosition,
|
position: XYPosition,
|
||||||
nodeId: string,
|
nodeId: string,
|
||||||
dims: DAGAutomationFlowDims,
|
dims: DAGAutomationFlowDims,
|
||||||
updater: SequenceUpdater,
|
namer: Namer,
|
||||||
i: number,
|
updater: SequenceUpdater,
|
||||||
|
i: number
|
||||||
) => {
|
) => {
|
||||||
const flowData: FlowData = {
|
const flowData: FlowData = {
|
||||||
nodes: [],
|
nodes: [],
|
||||||
edges: [],
|
edges: [],
|
||||||
};
|
};
|
||||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
onXClick: () => updater.removeNode(i),
|
onXClick: () => updater.removeNode(i),
|
||||||
});
|
namer,
|
||||||
let lastPos: XYPosition = position;
|
});
|
||||||
// conditions
|
let lastPos: XYPosition = position;
|
||||||
node.choose.forEach(({ sequence, conditions }, j) => {
|
// conditions
|
||||||
const sequenceId = `${nodeId}.${j}`;
|
node.choose.forEach(({ sequence, conditions }, j) => {
|
||||||
// edit/delete circle
|
const sequenceId = `${nodeId}.${j}`;
|
||||||
const circle = makeFlowCircle(`${sequenceId}>delete`, {
|
// edit/delete circle
|
||||||
|
const circle = makeFlowCircle(
|
||||||
|
`${sequenceId}>delete`,
|
||||||
|
dims.flipped
|
||||||
|
? {
|
||||||
|
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
}
|
||||||
|
: {
|
||||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
}, {
|
},
|
||||||
size: dims.circleSize,
|
{
|
||||||
onRemove: createOnRemoveForChooseNode(
|
flipped: dims.flipped,
|
||||||
node,
|
size: dims.circleSize,
|
||||||
d => updater.updateNode(i, d),
|
onRemove: createOnRemoveForChooseNode(
|
||||||
j,
|
node,
|
||||||
),
|
(d) => updater.updateNode(i, d),
|
||||||
})
|
j
|
||||||
flowData.nodes.push(circle)
|
),
|
||||||
addEdge(flowData, nodeId, circle.id, true)
|
}
|
||||||
const condNode = makeConditionPoint(
|
|
||||||
`${sequenceId}>cond`,
|
|
||||||
{
|
|
||||||
x: circle.position.x + dims.circleSize * dims.distanceFactor,
|
|
||||||
y: circle.position.y + dims.circleSize / 8,
|
|
||||||
},
|
|
||||||
dims,
|
|
||||||
conditions.length,
|
|
||||||
updater.makeOnEditConditionsForChooseNode(i, j)
|
|
||||||
);
|
|
||||||
flowData.nodes.push(condNode)
|
|
||||||
addEdge(flowData, circle.id, condNode.id, true)
|
|
||||||
|
|
||||||
// actual sub sequence
|
|
||||||
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
|
|
||||||
...dims,
|
|
||||||
padding: {
|
|
||||||
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
|
|
||||||
y: condNode.position.y - dims.conditionHeight / 2,
|
|
||||||
},
|
|
||||||
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
|
|
||||||
if (lastPoint.position) {
|
|
||||||
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
|
||||||
} else {
|
|
||||||
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
const totalChildren = node.choose.length;
|
|
||||||
|
|
||||||
// add button
|
|
||||||
const addCirlce = makeAddButton(
|
|
||||||
`${nodeId}>add`,
|
|
||||||
{
|
|
||||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
|
||||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
|
||||||
},
|
|
||||||
dims,
|
|
||||||
() => updater.updateNode(i, {
|
|
||||||
...node,
|
|
||||||
choose: [
|
|
||||||
...node.choose,
|
|
||||||
{
|
|
||||||
sequence: [],
|
|
||||||
conditions: [],
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}),
|
|
||||||
false,
|
|
||||||
);
|
);
|
||||||
flowData.nodes.push(addCirlce)
|
flowData.nodes.push(circle);
|
||||||
addEdge(flowData, nodeId, addCirlce.id, true)
|
addEdge(flowData, nodeId, circle.id, true);
|
||||||
|
const condNode = makeConditionPoint(
|
||||||
|
`${sequenceId}>cond`,
|
||||||
|
dims.flipped
|
||||||
|
? {
|
||||||
|
y: circle.position.y + dims.circleSize * dims.distanceFactor,
|
||||||
|
x: circle.position.x - dims.circleSize,
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
x: circle.position.x + dims.circleSize * dims.distanceFactor,
|
||||||
|
y: circle.position.y + dims.circleSize / 8,
|
||||||
|
},
|
||||||
|
dims,
|
||||||
|
conditions.length,
|
||||||
|
updater.makeOnEditConditionsForChooseNode(i, j)
|
||||||
|
);
|
||||||
|
flowData.nodes.push(condNode);
|
||||||
|
addEdge(flowData, circle.id, condNode.id, true);
|
||||||
|
|
||||||
// else
|
// actual sub sequence
|
||||||
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
|
const lastPoint = sequenceToFlow(
|
||||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
flowData,
|
||||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
|
sequence,
|
||||||
}, { size: dims.circleSize })
|
condNode.id,
|
||||||
flowData.nodes.push(elseCircle)
|
{
|
||||||
addEdge(flowData, nodeId, elseCircle.id, true)
|
|
||||||
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
|
|
||||||
...dims,
|
...dims,
|
||||||
padding: {
|
padding: dims.flipped
|
||||||
|
? {
|
||||||
|
y: condNode.position.y - dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: condNode.position.x - dims.conditionHeight / 2,
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
|
||||||
|
y: condNode.position.y - dims.conditionHeight / 2,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
namer,
|
||||||
|
updater.makeChildUpdaterForChooseAction(i, j),
|
||||||
|
`${sequenceId}.`
|
||||||
|
);
|
||||||
|
if (lastPoint.position) {
|
||||||
|
lastPos = xyApply(lastPos, lastPoint.position, Math.max);
|
||||||
|
} else {
|
||||||
|
lastPos = xyApply(
|
||||||
|
lastPos,
|
||||||
|
dims.flipped
|
||||||
|
? {
|
||||||
|
y: lastPos.y,
|
||||||
|
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
x: lastPos.x,
|
||||||
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
},
|
||||||
|
Math.max
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const totalChildren = node.choose.length;
|
||||||
|
|
||||||
|
// add button
|
||||||
|
const addCirlce = makeAddButton(
|
||||||
|
`${nodeId}>add`,
|
||||||
|
dims.flipped
|
||||||
|
? {
|
||||||
|
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
},
|
||||||
|
dims,
|
||||||
|
() =>
|
||||||
|
updater.updateNode(i, {
|
||||||
|
...node,
|
||||||
|
choose: [
|
||||||
|
...node.choose,
|
||||||
|
{
|
||||||
|
sequence: [],
|
||||||
|
conditions: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
false
|
||||||
|
);
|
||||||
|
flowData.nodes.push(addCirlce);
|
||||||
|
addEdge(flowData, nodeId, addCirlce.id, true);
|
||||||
|
|
||||||
|
// else
|
||||||
|
const elseCircle = makeFlowCircle(
|
||||||
|
`${nodeId}>else`,
|
||||||
|
dims.flipped
|
||||||
|
? {
|
||||||
|
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: lastPos.x + dims.nodeWidth * dims.distanceFactor * 2,
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
|
||||||
|
},
|
||||||
|
{ size: dims.circleSize, flipped: dims.flipped }
|
||||||
|
);
|
||||||
|
flowData.nodes.push(elseCircle);
|
||||||
|
addEdge(flowData, nodeId, elseCircle.id, true);
|
||||||
|
const lastPoint = sequenceToFlow(
|
||||||
|
flowData,
|
||||||
|
node.default ?? [],
|
||||||
|
elseCircle.id,
|
||||||
|
{
|
||||||
|
...dims,
|
||||||
|
padding: dims.flipped
|
||||||
|
? {
|
||||||
|
y: position.y,
|
||||||
|
x: elseCircle.position.x - 1.4 * dims.circleSize,
|
||||||
|
}
|
||||||
|
: {
|
||||||
x: position.x - dims.nodeWidth,
|
x: position.x - dims.nodeWidth,
|
||||||
y: elseCircle.position.y - dims.circleSize / 4,
|
y: elseCircle.position.y - dims.circleSize / 4,
|
||||||
},
|
},
|
||||||
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
|
},
|
||||||
if (lastPoint.position) {
|
namer,
|
||||||
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
updater.makeChildUpdaterForChooseAction(i, null),
|
||||||
} else {
|
`${nodeId}.${totalChildren}.`
|
||||||
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
|
);
|
||||||
}
|
if (lastPoint.position) {
|
||||||
return { lastPos, flowData }
|
lastPos = xyApply(lastPos, lastPoint.position, Math.max);
|
||||||
}
|
} else {
|
||||||
|
lastPos = xyApply(lastPos, elseCircle.position, Math.max);
|
||||||
|
}
|
||||||
|
return { lastPos, flowData };
|
||||||
|
};
|
||||||
|
|
||||||
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
|
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
|
||||||
fd1.edges = fd1.edges.concat(fd2.edges);
|
fd1.edges = fd1.edges.concat(fd2.edges);
|
||||||
fd1.nodes = fd1.nodes.concat(fd2.nodes);
|
fd1.nodes = fd1.nodes.concat(fd2.nodes);
|
||||||
return fd1
|
return fd1;
|
||||||
}
|
};
|
||||||
@@ -1,53 +1,74 @@
|
|||||||
import { AutomationTrigger } from 'types/automations/triggers';
|
import { AutomationTrigger } from "types/automations/triggers";
|
||||||
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
|
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from "./types";
|
||||||
import { makeAddButton } from './flowDataMods';
|
import { makeAddButton } from "./flowDataMods";
|
||||||
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
||||||
|
|
||||||
export const triggerToFlow = (
|
export const triggerToFlow = (
|
||||||
flowData: FlowData,
|
flowData: FlowData,
|
||||||
trigger: AutomationTrigger[],
|
trigger: AutomationTrigger[],
|
||||||
toPoint: string,
|
toPoint: string,
|
||||||
dims: DAGAutomationFlowDims,
|
dims: DAGAutomationFlowDims,
|
||||||
opts: TriggerMakerOptions,
|
opts: TriggerMakerOptions
|
||||||
) => {
|
) => {
|
||||||
const {
|
const {
|
||||||
distanceFactor,
|
distanceFactor,
|
||||||
nodeHeight,
|
nodeHeight,
|
||||||
nodeWidth,
|
nodeWidth,
|
||||||
padding,
|
padding,
|
||||||
conditionHeight,
|
conditionHeight,
|
||||||
} = dims;
|
circleSize,
|
||||||
// convert all triggers to dag nodes
|
flipped,
|
||||||
trigger.forEach((t, i) => {
|
} = dims;
|
||||||
const flowId = `t-${i}`;
|
// convert all triggers to dag nodes
|
||||||
flowData.nodes.push({
|
trigger.forEach((t, i) => {
|
||||||
id: flowId,
|
const flowId = `t-${i}`;
|
||||||
type: 'dagnode',
|
flowData.nodes.push({
|
||||||
data: {
|
id: flowId,
|
||||||
label: getDescriptionFromAutomationNode(t),
|
type: "dagnode",
|
||||||
height: nodeHeight,
|
data: {
|
||||||
width: nodeWidth,
|
label: getDescriptionFromAutomationNode(t, opts.namer, true),
|
||||||
color: 'red',
|
height: nodeHeight,
|
||||||
onEditClick: () => opts.onEdit(i),
|
width: nodeWidth,
|
||||||
onXClick: () => opts.onDelete(i),
|
flipped,
|
||||||
},
|
color: "red",
|
||||||
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i }
|
onEditClick: () => opts.onEdit(i),
|
||||||
})
|
onXClick: () => opts.onDelete(i),
|
||||||
flowData.edges.push({
|
},
|
||||||
id: `e(${flowId})-(${toPoint})`,
|
position: flipped
|
||||||
source: flowId,
|
? {
|
||||||
target: toPoint,
|
y: padding.y,
|
||||||
})
|
x: padding.x + nodeWidth * distanceFactor * i,
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
x: padding.x,
|
||||||
|
y: padding.y + nodeHeight * distanceFactor * i,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
flowData.edges.push({
|
||||||
|
id: `e(${flowId})-(${toPoint})`,
|
||||||
|
source: flowId,
|
||||||
|
target: toPoint,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
// create a 'add button'
|
// create a 'add button'
|
||||||
flowData.nodes.push(makeAddButton(
|
flowData.nodes.push(
|
||||||
'trigger-add',
|
makeAddButton(
|
||||||
{
|
"trigger-add",
|
||||||
|
flipped
|
||||||
|
? {
|
||||||
|
y: padding.y + circleSize / 4,
|
||||||
|
x: padding.x + nodeWidth * distanceFactor * trigger.length,
|
||||||
|
}
|
||||||
|
: {
|
||||||
x: padding.x + nodeWidth * 0.4,
|
x: padding.x + nodeWidth * 0.4,
|
||||||
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
|
y:
|
||||||
},
|
padding.y +
|
||||||
dims,
|
conditionHeight / 2 +
|
||||||
opts.onAdd
|
nodeHeight * distanceFactor * trigger.length,
|
||||||
))
|
},
|
||||||
}
|
dims,
|
||||||
|
opts.onAdd
|
||||||
|
)
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -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> = (
|
||||||
|
|||||||
@@ -2,140 +2,131 @@ import { AutomationSequenceNode } from "types/automations";
|
|||||||
import { ChooseAction } from "types/automations/actions";
|
import { ChooseAction } from "types/automations/actions";
|
||||||
import { AutomationCondition } from "types/automations/conditions";
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
import { UpdateModalState } from "./types";
|
import { UpdateModalState } from "./types";
|
||||||
import { getNodeType } from '../../utils/automations';
|
import { getNodeType } from "../../utils/automations";
|
||||||
|
|
||||||
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
|
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
|
||||||
|
|
||||||
export const makeSequenceUpdater = (
|
export const makeSequenceUpdater = (
|
||||||
sequence: AutomationSequenceNode[],
|
sequence: AutomationSequenceNode[],
|
||||||
onChange: (s: AutomationSequenceNode[]) => void,
|
onChange: (s: AutomationSequenceNode[]) => void,
|
||||||
openModal: UpdateModalState,
|
openModal: UpdateModalState
|
||||||
) => ({
|
) => ({
|
||||||
sequence,
|
sequence,
|
||||||
onChange,
|
onChange,
|
||||||
removeNode(i: number) {
|
removeNode(i: number) {
|
||||||
return onChange([
|
return onChange([...sequence.slice(0, i), ...sequence.slice(i + 1)]);
|
||||||
...sequence.slice(0, i),
|
|
||||||
...sequence.slice(i + 1),
|
|
||||||
])
|
|
||||||
},
|
},
|
||||||
addNode() {
|
addNode() {
|
||||||
return openModal({
|
return openModal({
|
||||||
single: true,
|
single: true,
|
||||||
saveBtnCreateText: true,
|
saveBtnCreateText: true,
|
||||||
node: {
|
node: {
|
||||||
choose: [],
|
device_id: "",
|
||||||
default: [],
|
|
||||||
},
|
},
|
||||||
update: n => onChange([
|
update: (n) => {
|
||||||
...sequence,
|
onChange([...sequence, n]);
|
||||||
n,
|
},
|
||||||
]),
|
allowedTypes: ["action", "condition"],
|
||||||
allowedTypes: ['action', 'condition']
|
});
|
||||||
})
|
|
||||||
},
|
},
|
||||||
updateNode(i: number, node: AutomationSequenceNode) {
|
updateNode(i: number, node: AutomationSequenceNode) {
|
||||||
return onChange([
|
if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
|
||||||
...sequence.slice(0, i),
|
return onChange([
|
||||||
node,
|
...sequence.slice(0, i),
|
||||||
...sequence.slice(i + 1),
|
node,
|
||||||
])
|
...sequence.slice(i + 1),
|
||||||
|
]);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
updateChooseActionData(i: number, data: ChooseAction) {
|
updateChooseActionData(i: number, data: ChooseAction) {
|
||||||
const node = sequence[i] as ChooseAction;
|
const node = sequence[i] as ChooseAction;
|
||||||
return this.updateNode(i, {
|
return this.updateNode(i, {
|
||||||
...node,
|
...node,
|
||||||
...data,
|
...data,
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
makeChildUpdaterForChooseAction(i: number, j: number | null) {
|
makeChildUpdaterForChooseAction(i: number, j: number | null) {
|
||||||
const node = sequence[i];
|
const node = sequence[i];
|
||||||
if ('choose' in node) {
|
if ("choose" in node) {
|
||||||
if (j !== null) {
|
if (j !== null) {
|
||||||
return makeSequenceUpdater(
|
return makeSequenceUpdater(
|
||||||
node.choose[j].sequence,
|
node.choose[j].sequence,
|
||||||
seq => this.updateNode(i, {
|
(seq) =>
|
||||||
...node,
|
this.updateNode(i, {
|
||||||
choose: [
|
...node,
|
||||||
...node.choose.slice(0, j),
|
choose: [
|
||||||
{
|
...node.choose.slice(0, j),
|
||||||
...node.choose[j],
|
{
|
||||||
sequence: seq,
|
...node.choose[j],
|
||||||
},
|
sequence: seq,
|
||||||
...node.choose.slice(j + 1),
|
},
|
||||||
]
|
...node.choose.slice(j + 1),
|
||||||
}),
|
],
|
||||||
openModal,
|
}),
|
||||||
)
|
openModal
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
return makeSequenceUpdater(
|
return makeSequenceUpdater(
|
||||||
node.default ?? [],
|
node.default ?? [],
|
||||||
seq => this.updateNode(i, {
|
(seq) =>
|
||||||
...node,
|
this.updateNode(i, {
|
||||||
default: seq
|
...node,
|
||||||
}),
|
default: seq,
|
||||||
openModal,
|
}),
|
||||||
)
|
openModal
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
throw new Error(`Cannot create sub-updater for ${node}`)
|
throw new Error(`Cannot create sub-updater for ${node}`);
|
||||||
},
|
},
|
||||||
makeOnModalOpenForNode(
|
makeOnModalOpenForNode(i: number, node: AutomationSequenceNode) {
|
||||||
i: number,
|
return () =>
|
||||||
node: AutomationSequenceNode,
|
openModal({
|
||||||
) {
|
single: true,
|
||||||
return () => openModal({
|
node,
|
||||||
single: true,
|
allowedTypes: ["action", "condition"],
|
||||||
node,
|
update: (n) => this.updateNode(i, n),
|
||||||
allowedTypes: ['action', 'condition'],
|
});
|
||||||
update: n => this.updateNode(i, n),
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
makeOnEditConditionsForChooseNode(
|
makeOnEditConditionsForChooseNode(i: number, j: number) {
|
||||||
i: number,
|
|
||||||
j: number,
|
|
||||||
) {
|
|
||||||
return () => {
|
return () => {
|
||||||
const node = sequence[i] as ChooseAction;
|
const node = sequence[i] as ChooseAction;
|
||||||
return openModal({
|
return openModal({
|
||||||
single: false,
|
single: false,
|
||||||
node: node.choose[j].conditions,
|
node: node.choose[j].conditions,
|
||||||
allowedTypes: ['condition'],
|
allowedTypes: ["condition"],
|
||||||
update: conditions => this.updateNode(i, {
|
update: (conditions) =>
|
||||||
...node,
|
this.updateNode(i, {
|
||||||
choose: [
|
...node,
|
||||||
...node.choose.slice(0, j),
|
choose: [
|
||||||
{
|
...node.choose.slice(0, j),
|
||||||
sequence: node.choose[j].sequence,
|
{
|
||||||
conditions: conditions as AutomationCondition[],
|
sequence: node.choose[j].sequence,
|
||||||
},
|
conditions: conditions as AutomationCondition[],
|
||||||
...node.choose.slice(j + 1),
|
},
|
||||||
]
|
...node.choose.slice(j + 1),
|
||||||
}),
|
],
|
||||||
})
|
}),
|
||||||
}
|
});
|
||||||
|
};
|
||||||
},
|
},
|
||||||
makeOnEditForBadNode(i: number) {
|
makeOnEditForBadNode(i: number) {
|
||||||
const node = sequence[i];
|
const node = sequence[i];
|
||||||
return () => openModal({
|
return () =>
|
||||||
single: true,
|
openModal({
|
||||||
isError: true,
|
single: true,
|
||||||
node,
|
isError: true,
|
||||||
allowedTypes: [getNodeType(node)],
|
node,
|
||||||
update: n => this.updateNode(i, n),
|
allowedTypes: [getNodeType(node)],
|
||||||
})
|
update: (n) => this.updateNode(i, n),
|
||||||
}
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const createOnRemoveForChooseNode =
|
||||||
export const createOnRemoveForChooseNode = (
|
(action: ChooseAction, update: (data: ChooseAction) => void, j: number) =>
|
||||||
action: ChooseAction,
|
() =>
|
||||||
update: (data: ChooseAction) => void,
|
update({
|
||||||
j: number
|
...action,
|
||||||
) => () => update({
|
choose: [...action.choose.slice(0, j), ...action.choose.slice(j + 1)],
|
||||||
...action,
|
});
|
||||||
choose: [
|
|
||||||
...action.choose.slice(0, j),
|
|
||||||
...action.choose.slice(j + 1),
|
|
||||||
]
|
|
||||||
})
|
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
import {
|
||||||
|
BaseOption,
|
||||||
|
InputAutoComplete,
|
||||||
|
} from "components/Inputs/InputAutoComplete";
|
||||||
|
import { InputDevice } from "components/Inputs/InputDevice";
|
||||||
|
import { InputDeviceCapabilties } from "components/Inputs/InputDeviceCapabilties";
|
||||||
|
import { InputEntity } from "components/Inputs/InputEntities";
|
||||||
|
import { cleanUpUndefined } from "components/NodeEditor/OptionManager/OptionManager";
|
||||||
|
import { DeviceBaseType, DeviceTypeCapability } from "haService/types";
|
||||||
|
import { AutomationDeviceState } from "types/automations/common";
|
||||||
|
|
||||||
|
export type DeviceEditorProps<DBT extends DeviceBaseType> = {
|
||||||
|
type: "action" | "condition" | "trigger";
|
||||||
|
state: Partial<AutomationDeviceState>;
|
||||||
|
setState: (n: Partial<AutomationDeviceState & Record<string, any>>) => void;
|
||||||
|
options: Record<string, BaseOption<{ data: DBT[] }>>;
|
||||||
|
caps: Partial<DeviceTypeCapability>;
|
||||||
|
};
|
||||||
|
export function DeviceEditor<DBT extends DeviceBaseType>({
|
||||||
|
type,
|
||||||
|
state,
|
||||||
|
setState,
|
||||||
|
caps,
|
||||||
|
options,
|
||||||
|
}: DeviceEditorProps<DBT>) {
|
||||||
|
// aliases
|
||||||
|
const update = (upd: Partial<AutomationDeviceState & Record<string, any>>) =>
|
||||||
|
setState(
|
||||||
|
cleanUpUndefined({
|
||||||
|
...state,
|
||||||
|
...upd,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
const actionId = (state.type ?? "") + (state.subtype ?? "");
|
||||||
|
const entities = ((options[actionId] ?? {}).data ?? [])
|
||||||
|
.map(({ entity_id }) => entity_id)
|
||||||
|
.filter((x) => !!x) as string[];
|
||||||
|
// render
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<InputDevice
|
||||||
|
key="devices"
|
||||||
|
label="Device"
|
||||||
|
value={state.device_id ?? ""}
|
||||||
|
onChange={(device_id) => setState({ device_id: device_id ?? "" })}
|
||||||
|
/>
|
||||||
|
<InputAutoComplete
|
||||||
|
key="action"
|
||||||
|
label="Action"
|
||||||
|
multiple={false}
|
||||||
|
value={actionId}
|
||||||
|
options={Object.keys(options).map((k) => options[k])}
|
||||||
|
disabled={Object.keys(options).length === 0}
|
||||||
|
onChange={(key) => {
|
||||||
|
if (key) {
|
||||||
|
const opt = options[key].data[0];
|
||||||
|
const updateObj: any = { ...opt };
|
||||||
|
delete updateObj["metadata"];
|
||||||
|
setState(updateObj);
|
||||||
|
} else {
|
||||||
|
setState({
|
||||||
|
device_id: state.device_id,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{entities.length > 0 && (
|
||||||
|
<InputEntity
|
||||||
|
key={"entities" + state.device_id}
|
||||||
|
label="Entity"
|
||||||
|
value={state.entity_id ?? ""}
|
||||||
|
multiple={false}
|
||||||
|
onChange={(entity_id) =>
|
||||||
|
update({ entity_id: entity_id ?? undefined })
|
||||||
|
}
|
||||||
|
preSelectedEntityIds={entities}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{caps?.extra_fields && (
|
||||||
|
<InputDeviceCapabilties
|
||||||
|
key="caps"
|
||||||
|
state={state}
|
||||||
|
setState={setState}
|
||||||
|
defn={caps.extra_fields}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{Object.keys(options).length + entities.length === 0 && (
|
||||||
|
<>This device has no {type}s.</>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,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
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
.MuiButtonBase-root.icon-button[type="button"] {
|
||||||
|
border-width: 1px;
|
||||||
|
border-style: solid;
|
||||||
|
max-width: 1.5em;
|
||||||
|
max-height: 1.5em;
|
||||||
|
}
|
||||||
@@ -1,30 +1,24 @@
|
|||||||
import { FC } from 'react';
|
import "./ButtonIcons.css";
|
||||||
import { IconBaseProps } from './base';
|
import { FC, ReactNode } from "react";
|
||||||
import { createAppUseStyles } from 'styles/theme';
|
import MuiIconButton, { IconButtonTypeMap } from "@mui/material/IconButton";
|
||||||
|
|
||||||
export interface ButtonIconStyleProps {
|
export const ButtonIcon: FC<{
|
||||||
}
|
icon: ReactNode;
|
||||||
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
|
onClick?: () => void;
|
||||||
children: FC<IconBaseProps>;
|
className?: string;
|
||||||
}
|
title?: string;
|
||||||
const useButtonIconStyles = createAppUseStyles(theme => ({
|
disabled?: boolean;
|
||||||
buttonIcon: {
|
color?: IconButtonTypeMap["props"]["color"];
|
||||||
borderRadius: "100%",
|
}> = (props) => {
|
||||||
borderWidth: 1,
|
return (
|
||||||
borderStyle: "groove",
|
<MuiIconButton
|
||||||
padding: "0.25em",
|
className={["icon-button", props.className ?? ""].join(" ")}
|
||||||
"&:hover": {
|
onClick={props.onClick}
|
||||||
backgroundColor: theme.secondaryAccent,
|
title={props.title}
|
||||||
cursor: 'pointer',
|
color={props.color}
|
||||||
}
|
disabled={props.disabled}
|
||||||
}
|
>
|
||||||
}))
|
{props.icon}
|
||||||
|
</MuiIconButton>
|
||||||
|
);
|
||||||
export const ButtonIcon: FC<ButtonIconProps> = ({
|
};
|
||||||
children: Child,
|
|
||||||
className,
|
|
||||||
...props
|
|
||||||
}) => <Child
|
|
||||||
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
|
|
||||||
/>
|
|
||||||
@@ -1,41 +1,50 @@
|
|||||||
import { ComponentStory } from "@storybook/react";
|
import { ComponentStory } from "@storybook/react";
|
||||||
|
|
||||||
import { IconBase } from "./base";
|
import { IconBase } from "./base";
|
||||||
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from ".";
|
import {
|
||||||
|
PencilIcon,
|
||||||
|
CheckMarkIcon,
|
||||||
|
TrashIcon,
|
||||||
|
InfoIcon,
|
||||||
|
ArrowIcon,
|
||||||
|
AddIcon,
|
||||||
|
ZoomIcon,
|
||||||
|
GearIcon,
|
||||||
|
} from ".";
|
||||||
import { ButtonIcon } from "./ButtonIcons";
|
import { ButtonIcon } from "./ButtonIcons";
|
||||||
import { Page } from "components/Page";
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'Icons',
|
title: "Icons",
|
||||||
component: IconBase,
|
component: IconBase,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
||||||
|
return (
|
||||||
return <Page>
|
<Page>
|
||||||
<PencilIcon {...args} />
|
<PencilIcon {...args} />
|
||||||
<CheckMarkIcon {...args} />
|
<CheckMarkIcon {...args} />
|
||||||
<AddIcon {...args} />
|
<AddIcon {...args} />
|
||||||
<TrashIcon {...args} />
|
<TrashIcon {...args} />
|
||||||
<InfoIcon {...args} />
|
<InfoIcon {...args} />
|
||||||
<ZoomIcon {...args} />
|
<ZoomIcon {...args} />
|
||||||
<GearIcon {...args} />
|
<GearIcon {...args} />
|
||||||
</Page>
|
</Page>
|
||||||
}
|
);
|
||||||
|
};
|
||||||
IconList.args = {
|
IconList.args = {
|
||||||
size: 2,
|
size: 2,
|
||||||
color: 'red'
|
color: "red",
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
||||||
|
return (
|
||||||
return <Page>
|
<Page>
|
||||||
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon>
|
<ButtonIcon icon={<ArrowIcon {...args} />} />
|
||||||
</Page>
|
</Page>
|
||||||
}
|
);
|
||||||
|
};
|
||||||
ButtonIconExample.args = {
|
ButtonIconExample.args = {
|
||||||
size: 2,
|
size: 2,
|
||||||
color: 'red'
|
color: "red",
|
||||||
}
|
};
|
||||||
@@ -1,7 +1,21 @@
|
|||||||
import { ButtonHTMLAttributes, FC } from "react";
|
import { FC, ReactNode } from "react";
|
||||||
import { useButtonStyles } from "./styles";
|
import MuiButton from "@mui/material/Button";
|
||||||
|
|
||||||
export const Button: FC<ButtonHTMLAttributes<HTMLButtonElement>> = props => {
|
export const Button: FC<{
|
||||||
const { classes } = useButtonStyles({});
|
className?: string;
|
||||||
return <button {...props} className={`${classes.input} ${props.className ?? ''}`} />
|
title?: string;
|
||||||
}
|
disabled?: boolean;
|
||||||
|
children?: ReactNode;
|
||||||
|
onClick?: () => void;
|
||||||
|
}> = (props) => {
|
||||||
|
return (
|
||||||
|
<MuiButton
|
||||||
|
className={props.className}
|
||||||
|
title={props.title}
|
||||||
|
disabled={props.disabled}
|
||||||
|
onClick={props.onClick}
|
||||||
|
variant="outlined"
|
||||||
|
children={props.children}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { FC } from "react";
|
||||||
|
import {
|
||||||
|
InputAutoComplete,
|
||||||
|
InputAutoCompletePropsBase,
|
||||||
|
} from "./InputAutoComplete";
|
||||||
|
import { useHAAreas } from "haService/AreaRegistry";
|
||||||
|
|
||||||
|
export type InputAreaProps = InputAutoCompletePropsBase & {
|
||||||
|
restrictToDomain?: string[];
|
||||||
|
restrictedIntegrations?: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const InputArea: FC<InputAreaProps> = (props) => {
|
||||||
|
// state
|
||||||
|
const areas = useHAAreas();
|
||||||
|
console.log(areas);
|
||||||
|
return (
|
||||||
|
<InputAutoComplete
|
||||||
|
{...props}
|
||||||
|
validateOption={(v) => areas.validateOptions(v)}
|
||||||
|
options={areas.getOptions()}
|
||||||
|
getID={areas.getID}
|
||||||
|
getLabel={areas.getLabel}
|
||||||
|
onlyShowLabel
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
.input-autocomplete .BaseBadge-root {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--chip>span {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 0.15em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--chip>span>small::before {
|
||||||
|
content: "/ ";
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--chip>span>small {
|
||||||
|
size: 0.15em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--errors {
|
||||||
|
margin-top: 0.75em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--errors ul {
|
||||||
|
padding: 0 0 0 1em;
|
||||||
|
margin: 0;
|
||||||
|
max-height: 2.5em;
|
||||||
|
overflow-y: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--tags {
|
||||||
|
max-height: 5em;
|
||||||
|
width: fit-content;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: auto;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--chip small {
|
||||||
|
max-width: 7em;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--popper {
|
||||||
|
min-width: fit-content;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { computeSimilarity } from "./InputAutoComplete";
|
||||||
|
|
||||||
|
test("similarity score", () => {
|
||||||
|
const searchTerms = [
|
||||||
|
"lught",
|
||||||
|
"light",
|
||||||
|
"light balcn",
|
||||||
|
"light bal",
|
||||||
|
"light balcony",
|
||||||
|
"Balcony lig",
|
||||||
|
].map((x) => computeSimilarity(x, "light.balcony", "Balcony Light"));
|
||||||
|
expect(searchTerms).toStrictEqual(searchTerms.sort());
|
||||||
|
});
|
||||||
|
|
||||||
|
test("similarity score", () => {
|
||||||
|
expect(
|
||||||
|
computeSimilarity(
|
||||||
|
"li",
|
||||||
|
"6592b3d6d05d3de6fa26c3dbd2edecc2",
|
||||||
|
"Balcony Lights"
|
||||||
|
)
|
||||||
|
).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
@@ -0,0 +1,256 @@
|
|||||||
|
import "./InputAutoComplete.css";
|
||||||
|
import Autocomplete from "@mui/material/Autocomplete";
|
||||||
|
import TextField from "@mui/material/TextField";
|
||||||
|
import Chip from "@mui/material/Chip";
|
||||||
|
import Badge from "@mui/material/Badge";
|
||||||
|
import Popper from "@mui/material/Popper";
|
||||||
|
import { SearchItem } from "./extras";
|
||||||
|
import { ReactNode } from "react";
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
|
||||||
|
export type BaseOption<T = {}> = {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
} & T;
|
||||||
|
export type Option<T = {}> = string | BaseOption<T>;
|
||||||
|
export type InputAutoCompleteProps<T extends Option<any>> = {
|
||||||
|
validateOption?: (v: string[]) => string[] | null;
|
||||||
|
groupBy?: (opt: T) => string;
|
||||||
|
options: T[];
|
||||||
|
getLabel?: (opt: T) => string;
|
||||||
|
getID?: (opt: T) => string;
|
||||||
|
} & InputAutoCompletePropsBase;
|
||||||
|
export type InputAutoCompletePropsBase = {
|
||||||
|
label?: string;
|
||||||
|
className?: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
required?: boolean;
|
||||||
|
onlyShowLabel?: boolean;
|
||||||
|
helperText?: ReactNode;
|
||||||
|
endAdornment?: ReactNode;
|
||||||
|
} & (
|
||||||
|
| {
|
||||||
|
value: string | null;
|
||||||
|
multiple?: false;
|
||||||
|
onChange: (v: string | null) => void;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
value: string | string[];
|
||||||
|
multiple: true;
|
||||||
|
onChange: (v: string[]) => void;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
export function computeSimilarity(
|
||||||
|
text: string,
|
||||||
|
optId: string,
|
||||||
|
optLabel: string
|
||||||
|
) {
|
||||||
|
let similarityScore = 0;
|
||||||
|
const lowCaseId = optId.toLocaleLowerCase();
|
||||||
|
const lowCaseLabel = optLabel.toLocaleLowerCase();
|
||||||
|
for (const segment of text.toLocaleLowerCase().split(" ")) {
|
||||||
|
if (lowCaseId.includes(segment)) {
|
||||||
|
similarityScore += lowCaseId.length / lowCaseId.length;
|
||||||
|
}
|
||||||
|
if (lowCaseLabel.includes(segment)) {
|
||||||
|
similarityScore += lowCaseLabel.length / lowCaseLabel.length;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return similarityScore;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function InputAutoComplete<T extends Option>(
|
||||||
|
props: InputAutoCompleteProps<T>
|
||||||
|
) {
|
||||||
|
// aliases
|
||||||
|
const getID = (opt: T): string => {
|
||||||
|
if (props.getID) {
|
||||||
|
return props.getID(opt);
|
||||||
|
}
|
||||||
|
if (typeof opt === "string") {
|
||||||
|
return opt;
|
||||||
|
}
|
||||||
|
return opt.id;
|
||||||
|
};
|
||||||
|
const getLabel = (opt: T): string => {
|
||||||
|
if (props.getLabel) {
|
||||||
|
return props.getLabel(opt);
|
||||||
|
}
|
||||||
|
if (typeof opt === "string") {
|
||||||
|
return opt;
|
||||||
|
}
|
||||||
|
return opt.label;
|
||||||
|
};
|
||||||
|
// processing of inputs
|
||||||
|
const value = Array.isArray(props.value)
|
||||||
|
? props.value
|
||||||
|
: !!props.value
|
||||||
|
? [props.value]
|
||||||
|
: [];
|
||||||
|
const errors = props.validateOption ? props.validateOption(value) : null;
|
||||||
|
const options = props.options
|
||||||
|
.filter((opt) => !value.includes(getID(opt)))
|
||||||
|
.sort((a, b) => {
|
||||||
|
return getID(a) > getID(b) ? 1 : -1;
|
||||||
|
});
|
||||||
|
|
||||||
|
// processing of errors
|
||||||
|
let helperText = props.helperText ?? <></>;
|
||||||
|
let error: boolean = false;
|
||||||
|
if (errors !== null) {
|
||||||
|
error = true;
|
||||||
|
if (errors.length > 0) {
|
||||||
|
helperText = (
|
||||||
|
<Badge
|
||||||
|
className="input-autocomplete--errors"
|
||||||
|
badgeContent={errors.length}
|
||||||
|
color="error"
|
||||||
|
>
|
||||||
|
<ul title={errors.join(", and")}>
|
||||||
|
{errors.map((msg, i) => (
|
||||||
|
<li key={i}>{msg}</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</Badge>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// events
|
||||||
|
const onChange = (_e: any, v: any) => {
|
||||||
|
const cleanValue: string[] =
|
||||||
|
v === null
|
||||||
|
? []
|
||||||
|
: Array.isArray(v)
|
||||||
|
? v.map((opt) => {
|
||||||
|
if (typeof opt === "string") {
|
||||||
|
return opt;
|
||||||
|
}
|
||||||
|
return opt.id;
|
||||||
|
})
|
||||||
|
: [v];
|
||||||
|
if (props.multiple) {
|
||||||
|
props.onChange(cleanValue);
|
||||||
|
} else {
|
||||||
|
props.onChange(cleanValue[cleanValue.length - 1]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<Autocomplete
|
||||||
|
className={["input-autocomplete", props.className ?? ""].join(" ")}
|
||||||
|
multiple={true}
|
||||||
|
freeSolo
|
||||||
|
value={value}
|
||||||
|
options={options}
|
||||||
|
onChange={onChange}
|
||||||
|
getOptionLabel={getLabel as any}
|
||||||
|
disabled={props.disabled}
|
||||||
|
PopperComponent={(props) => {
|
||||||
|
return (
|
||||||
|
<Popper
|
||||||
|
key={Math.random().toString()}
|
||||||
|
{...props}
|
||||||
|
className={[props.className, "input-autocomplete--popper"].join(
|
||||||
|
" "
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
filterOptions={(opts, s) => {
|
||||||
|
const searchTerm = s.inputValue;
|
||||||
|
if (!searchTerm) {
|
||||||
|
return opts;
|
||||||
|
}
|
||||||
|
return opts
|
||||||
|
.map((opt) => {
|
||||||
|
return {
|
||||||
|
opt,
|
||||||
|
similarityScore: computeSimilarity(
|
||||||
|
searchTerm,
|
||||||
|
getID(opt),
|
||||||
|
getLabel(opt)
|
||||||
|
),
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.filter((opt) => opt.similarityScore > 0)
|
||||||
|
.sort((a, b) => {
|
||||||
|
return a.similarityScore < b.similarityScore ? 1 : -1;
|
||||||
|
})
|
||||||
|
.map(({ opt }) => opt);
|
||||||
|
}}
|
||||||
|
groupBy={props.groupBy}
|
||||||
|
renderOption={(listProps, option, { inputValue }) => {
|
||||||
|
const label = getLabel(option);
|
||||||
|
const id = getID(option);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<SearchItem
|
||||||
|
key={label + id}
|
||||||
|
listProps={listProps}
|
||||||
|
id={id}
|
||||||
|
label={label}
|
||||||
|
searchTerm={inputValue}
|
||||||
|
onlyShowLabel={props.onlyShowLabel}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
renderInput={(params) => (
|
||||||
|
<TextField
|
||||||
|
{...params}
|
||||||
|
InputProps={{
|
||||||
|
...params.InputProps,
|
||||||
|
endAdornment: props.endAdornment ?? params.InputProps.endAdornment,
|
||||||
|
}}
|
||||||
|
variant="filled"
|
||||||
|
required={props.required}
|
||||||
|
label={props.label ?? "Entity ID"}
|
||||||
|
helperText={helperText}
|
||||||
|
disabled={props.disabled}
|
||||||
|
error={error}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
renderTags={(tagValue, getTagProps) => {
|
||||||
|
const inner = (
|
||||||
|
<div className="input-autocomplete--tags">
|
||||||
|
{tagValue.map((option, index) => {
|
||||||
|
const label = getLabel(option);
|
||||||
|
const id = getID(option);
|
||||||
|
const tagProps = getTagProps({ index });
|
||||||
|
tagProps.className += " input-autocomplete--chip";
|
||||||
|
return (
|
||||||
|
<Chip
|
||||||
|
size="medium"
|
||||||
|
title={`${label} / ${id}`}
|
||||||
|
label={
|
||||||
|
<>
|
||||||
|
{id === label ? (
|
||||||
|
<span>{prettyName(label)}</span>
|
||||||
|
) : (
|
||||||
|
<b>{label}</b>
|
||||||
|
)}
|
||||||
|
{id !== label && !props.onlyShowLabel && (
|
||||||
|
<small>{id}</small>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
{...tagProps}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
if (props.multiple) {
|
||||||
|
return (
|
||||||
|
<Badge badgeContent={tagValue.length} color="info">
|
||||||
|
{inner}
|
||||||
|
</Badge>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return inner;
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,11 +1,15 @@
|
|||||||
import TextField from "@mui/material/TextField";
|
import TextField from "@mui/material/TextField";
|
||||||
import Autocomplete from "@mui/material/Autocomplete";
|
import Autocomplete from "@mui/material/Autocomplete";
|
||||||
|
import { ReactNode } from "react";
|
||||||
|
|
||||||
export interface InputAutoTextProps {
|
export interface InputAutoTextProps {
|
||||||
label: string;
|
label: string;
|
||||||
value: string;
|
value: string;
|
||||||
|
className?: string;
|
||||||
options?: string[];
|
options?: string[];
|
||||||
error?: string;
|
error?: string;
|
||||||
|
required?: boolean;
|
||||||
|
endAdornment?: ReactNode;
|
||||||
onChange: (v: string) => void;
|
onChange: (v: string) => void;
|
||||||
}
|
}
|
||||||
export default function InputAutoText({
|
export default function InputAutoText({
|
||||||
@@ -13,28 +17,36 @@ export default function InputAutoText({
|
|||||||
label,
|
label,
|
||||||
options = [],
|
options = [],
|
||||||
onChange,
|
onChange,
|
||||||
|
className,
|
||||||
|
required,
|
||||||
|
endAdornment,
|
||||||
error,
|
error,
|
||||||
}: InputAutoTextProps) {
|
}: InputAutoTextProps) {
|
||||||
|
return (
|
||||||
return <Autocomplete
|
<Autocomplete
|
||||||
freeSolo
|
freeSolo
|
||||||
value={value}
|
className={className}
|
||||||
options={options}
|
value={value}
|
||||||
onChange={(_e, v) => onChange(
|
options={options}
|
||||||
v === null ? "" : v
|
onChange={(_e, v) => onChange(v === null ? "" : v)}
|
||||||
)}
|
renderInput={(params) => (
|
||||||
renderInput={params => <TextField
|
<TextField
|
||||||
{...params}
|
{...params}
|
||||||
variant="filled"
|
required={required}
|
||||||
label={label}
|
variant="filled"
|
||||||
error={error !== undefined}
|
label={label}
|
||||||
helperText={error}
|
error={error !== undefined}
|
||||||
onChange={e => {
|
helperText={error}
|
||||||
e.preventDefault();
|
fullWidth
|
||||||
onChange(
|
InputProps={{
|
||||||
e.target.value
|
endAdornment,
|
||||||
)
|
}}
|
||||||
}}
|
onChange={(e) => {
|
||||||
/>}
|
e.preventDefault();
|
||||||
/>
|
onChange(e.target.value);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
@@ -1,20 +1,77 @@
|
|||||||
import Checkbox from "@mui/material/Checkbox";
|
import Checkbox from "@mui/material/Checkbox";
|
||||||
import FormGroup from '@mui/material/FormGroup';
|
import FormGroup from "@mui/material/FormGroup";
|
||||||
import FormControlLabel from '@mui/material/FormControlLabel';
|
import FormControlLabel from "@mui/material/FormControlLabel";
|
||||||
|
import { ReactNode } from "react";
|
||||||
|
import FormHelperText from "@mui/material/FormHelperText";
|
||||||
|
import InputAdornment from "@mui/material/InputAdornment";
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
label: string;
|
label: string;
|
||||||
value: boolean;
|
value: boolean;
|
||||||
|
title?: string;
|
||||||
|
helperText?: ReactNode;
|
||||||
onChange: (v: boolean) => void;
|
onChange: (v: boolean) => void;
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
|
className?: string;
|
||||||
|
required?: boolean;
|
||||||
|
placeholder?: string;
|
||||||
|
endAdornment?: ReactNode;
|
||||||
}
|
}
|
||||||
export default function InputBoolean({
|
export default function InputBoolean({
|
||||||
label,
|
label,
|
||||||
value = false,
|
value = false,
|
||||||
|
title,
|
||||||
|
helperText,
|
||||||
onChange,
|
onChange,
|
||||||
disabled = false,
|
disabled = false,
|
||||||
|
className,
|
||||||
|
required,
|
||||||
|
placeholder,
|
||||||
|
endAdornment,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
return <FormGroup>
|
return (
|
||||||
<FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} />
|
<FormGroup
|
||||||
</FormGroup>
|
className={className}
|
||||||
|
title={title}
|
||||||
|
style={{
|
||||||
|
alignItems: "flex-start",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<FormControlLabel
|
||||||
|
disabled={disabled}
|
||||||
|
control={
|
||||||
|
<Checkbox
|
||||||
|
checked={value}
|
||||||
|
onChange={() => onChange(!value)}
|
||||||
|
required={required}
|
||||||
|
placeholder={placeholder}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
label={
|
||||||
|
endAdornment ? (
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
display: "flex",
|
||||||
|
flexDirection: "row",
|
||||||
|
justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
style={{
|
||||||
|
flex: 1,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{label}
|
||||||
|
</span>
|
||||||
|
<InputAdornment position="end">{endAdornment}</InputAdornment>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
label
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<FormHelperText>{helperText}</FormHelperText>
|
||||||
|
</FormGroup>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
import "./InputTime.css";
|
||||||
|
import { useState, useEffect, FC } from "react";
|
||||||
|
import TextField from "@mui/material/TextField";
|
||||||
|
import EditIcon from "@mui/icons-material/Edit";
|
||||||
|
import CloseIcon from "@mui/icons-material/Close";
|
||||||
|
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
|
||||||
|
import {
|
||||||
|
convertAutomationTimeToTimeObject,
|
||||||
|
convertObjectToAutomationTimeString,
|
||||||
|
} from "utils/time";
|
||||||
|
import { convertAutomationTimeToTimeString } from "utils/time";
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
import InputLabel from "@mui/material/InputLabel";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
|
||||||
|
// constants
|
||||||
|
const fields: Array<keyof AutomationTimeObject> = [
|
||||||
|
"hours",
|
||||||
|
"minutes",
|
||||||
|
"seconds",
|
||||||
|
"milliseconds",
|
||||||
|
];
|
||||||
|
export interface Props {
|
||||||
|
label: string;
|
||||||
|
value?: AutomationTime;
|
||||||
|
onChange: (v?: AutomationTimeObject) => void;
|
||||||
|
}
|
||||||
|
export const InputTime: FC<Props> = (props) => {
|
||||||
|
// state
|
||||||
|
const [disabled, setDisabled] = useState(!props.value);
|
||||||
|
const [displayValue, setDisplayValue] = useState(
|
||||||
|
convertAutomationTimeToTimeObject(props.value)
|
||||||
|
);
|
||||||
|
|
||||||
|
// process display input
|
||||||
|
const updateOne = (k: keyof AutomationTimeObject) => (v: string) => {
|
||||||
|
if (Number(v) < 0) {
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
[k]: 0,
|
||||||
|
});
|
||||||
|
} else if (k === "hours") {
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
[k]: Number(v),
|
||||||
|
});
|
||||||
|
} else if (k === "minutes") {
|
||||||
|
let minutes = Number(v);
|
||||||
|
let { hours = 0 } = displayValue;
|
||||||
|
if (minutes > 59) {
|
||||||
|
const additonalHours = Math.floor(minutes / 60);
|
||||||
|
hours += additonalHours;
|
||||||
|
minutes = minutes - additonalHours * 60;
|
||||||
|
}
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
minutes,
|
||||||
|
hours,
|
||||||
|
});
|
||||||
|
} else if (k === "seconds") {
|
||||||
|
let seconds = Number(v);
|
||||||
|
let { hours = 0, minutes = 0 } = displayValue;
|
||||||
|
if (seconds > 59) {
|
||||||
|
const additonalHours = Math.floor(seconds / (60 * 60));
|
||||||
|
hours += additonalHours;
|
||||||
|
seconds = seconds - additonalHours * 60;
|
||||||
|
}
|
||||||
|
if (seconds > 59) {
|
||||||
|
const additionalMinutes = Math.floor(seconds / 60);
|
||||||
|
minutes += additionalMinutes;
|
||||||
|
seconds = seconds - additionalMinutes * 60;
|
||||||
|
}
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
minutes,
|
||||||
|
hours,
|
||||||
|
seconds,
|
||||||
|
});
|
||||||
|
} else if (k === "milliseconds") {
|
||||||
|
let milliseconds = Number(v);
|
||||||
|
let { hours = 0, minutes = 0, seconds = 0 } = displayValue;
|
||||||
|
if (milliseconds > 1000) {
|
||||||
|
const additonalHours = Math.floor(milliseconds / (60 * 60 * 1000));
|
||||||
|
hours += additonalHours;
|
||||||
|
milliseconds = milliseconds - additonalHours * 60 * 60 * 1000;
|
||||||
|
}
|
||||||
|
if (milliseconds > 1000) {
|
||||||
|
const additionalMinutes = Math.floor(milliseconds / (60 * 1000));
|
||||||
|
minutes += additionalMinutes;
|
||||||
|
milliseconds = milliseconds - additionalMinutes * 60 * 1000;
|
||||||
|
}
|
||||||
|
if (milliseconds > 1000) {
|
||||||
|
const additionalSeconds = Math.floor(milliseconds / 1000);
|
||||||
|
seconds += additionalSeconds;
|
||||||
|
milliseconds = milliseconds - additionalSeconds * 1000;
|
||||||
|
}
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
minutes,
|
||||||
|
hours,
|
||||||
|
seconds,
|
||||||
|
milliseconds,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// effect
|
||||||
|
useEffect(() => {
|
||||||
|
if (disabled && !props.value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (disabled) {
|
||||||
|
props.onChange(undefined);
|
||||||
|
} else {
|
||||||
|
const pVal = convertAutomationTimeToTimeString(props.value);
|
||||||
|
const cVal = convertObjectToAutomationTimeString(displayValue);
|
||||||
|
if (pVal !== cVal) {
|
||||||
|
props.onChange(displayValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line
|
||||||
|
}, [disabled, displayValue]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="input-time">
|
||||||
|
<InputLabel>{props.label}</InputLabel>
|
||||||
|
<div className="input-time--inner">
|
||||||
|
{fields.map((name) => (
|
||||||
|
<TextField
|
||||||
|
key={name}
|
||||||
|
variant="filled"
|
||||||
|
label={prettyName(name)}
|
||||||
|
defaultValue="00"
|
||||||
|
InputProps={{
|
||||||
|
disabled,
|
||||||
|
type: "number",
|
||||||
|
title: prettyName(name),
|
||||||
|
}}
|
||||||
|
value={displayValue[name] ?? 0}
|
||||||
|
onChange={(e) => updateOne(name)(e.target.value)}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
<ButtonIcon
|
||||||
|
onClick={() => setDisabled(!disabled)}
|
||||||
|
icon={disabled ? <EditIcon /> : <CloseIcon />}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { InputDevice } from "./InputDevice";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Inputs/InputDevice',
|
||||||
|
component: InputDevice,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
argTypes: {}
|
||||||
|
} as ComponentMeta<typeof InputDevice>;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof InputDevice> = args => {
|
||||||
|
const [value, setValue] = useState(args.value)
|
||||||
|
return <Page>
|
||||||
|
<div style={{
|
||||||
|
maxWidth: 200
|
||||||
|
}}>
|
||||||
|
<InputDevice {...args} value={value as any} onChange={(v: any) => {
|
||||||
|
setValue(v)
|
||||||
|
args.onChange(v as any)
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
</Page>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Single = Template.bind({})
|
||||||
|
Single.args = {
|
||||||
|
...Single.args,
|
||||||
|
multiple: false,
|
||||||
|
value: 'sensor.humidity_bathroom'
|
||||||
|
} as any
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { FC } from "react";
|
||||||
|
import { useHADeviceRegistry } from "haService";
|
||||||
|
import {
|
||||||
|
InputAutoComplete,
|
||||||
|
InputAutoCompletePropsBase,
|
||||||
|
} from "./InputAutoComplete";
|
||||||
|
|
||||||
|
export type InputDeviceProps = InputAutoCompletePropsBase;
|
||||||
|
|
||||||
|
export const InputDevice: FC<InputDeviceProps> = (props) => {
|
||||||
|
// state
|
||||||
|
const dr = useHADeviceRegistry();
|
||||||
|
return (
|
||||||
|
<InputAutoComplete
|
||||||
|
{...props}
|
||||||
|
label={props.label ?? "Device ID"}
|
||||||
|
getID={dr.getID}
|
||||||
|
getLabel={dr.getLabel}
|
||||||
|
options={dr.getOptions()}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
.input-device-caps {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
import "./InputDeviceCapabilties.css";
|
||||||
|
import { HaFormSchema } from "haService/types";
|
||||||
|
import { useSnackbar } from "notistack";
|
||||||
|
import { useRef } from "react";
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
import { InputAutoComplete, Option } from "./InputAutoComplete";
|
||||||
|
import InputBoolean from "./InputBoolean";
|
||||||
|
import { InputTime } from "./InputDayTime";
|
||||||
|
import InputNumber from "./InputNumber";
|
||||||
|
import InputText from "./InputText";
|
||||||
|
|
||||||
|
export type InputDeviceCapabiltiesProps<T extends Record<string, any>> = {
|
||||||
|
defn: HaFormSchema[];
|
||||||
|
state: T;
|
||||||
|
setState: (s: T) => void;
|
||||||
|
};
|
||||||
|
export function InputDeviceCapabilties<T extends Record<string, any>>(
|
||||||
|
props: InputDeviceCapabiltiesProps<T>
|
||||||
|
) {
|
||||||
|
const snackr = useSnackbar();
|
||||||
|
const msgRef = useRef<Record<string, boolean>>({});
|
||||||
|
return (
|
||||||
|
<div className="input-device-caps">
|
||||||
|
{props.defn.map((def, i) => {
|
||||||
|
const prop = {
|
||||||
|
key: String(i),
|
||||||
|
className: "input-device-cap",
|
||||||
|
label:
|
||||||
|
prettyName(def.name) +
|
||||||
|
" " +
|
||||||
|
(JSON.stringify(def.description) ?? ""),
|
||||||
|
required: def.required,
|
||||||
|
placeholder: def.default,
|
||||||
|
value: props.state[def.name],
|
||||||
|
onChange: (v: any) =>
|
||||||
|
props.setState({
|
||||||
|
...props.state,
|
||||||
|
[def.name]: v,
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
if (def.type === "boolean") {
|
||||||
|
return <InputBoolean {...prop} />;
|
||||||
|
} else if (def.type === "string") {
|
||||||
|
return <InputText {...prop} />;
|
||||||
|
} else if (def.type === "integer") {
|
||||||
|
return (
|
||||||
|
<InputNumber
|
||||||
|
{...prop}
|
||||||
|
step={1}
|
||||||
|
max={def.valueMax}
|
||||||
|
min={def.valueMin}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
} else if (def.type === "float") {
|
||||||
|
return <InputNumber {...prop} step={0.01} />;
|
||||||
|
} else if (def.type === "constant") {
|
||||||
|
return (
|
||||||
|
<InputText {...prop} value={def.value ?? props.state[def.name]} />
|
||||||
|
);
|
||||||
|
} else if (def.type === "positive_time_period_dict") {
|
||||||
|
return <InputTime {...prop} />;
|
||||||
|
} else if (def.type === "select") {
|
||||||
|
return (
|
||||||
|
<InputAutoComplete
|
||||||
|
{...prop}
|
||||||
|
multiple={false}
|
||||||
|
options={def.options.map(([value, label]) => ({
|
||||||
|
id: value,
|
||||||
|
label: prettyName(label),
|
||||||
|
}))}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
} else if (def.type === "multi_select") {
|
||||||
|
let options: Option[] = [];
|
||||||
|
if (Array.isArray(def.options)) {
|
||||||
|
options = def.options.map((opt) =>
|
||||||
|
Array.isArray(opt)
|
||||||
|
? {
|
||||||
|
id: opt[0],
|
||||||
|
label: prettyName(opt[1]),
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
id: opt,
|
||||||
|
label: prettyName(opt),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
options = Object.entries(def.options).map(([id, label]) => ({
|
||||||
|
id,
|
||||||
|
label: prettyName(label),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<InputAutoComplete {...prop} multiple={true} options={options} />
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!msgRef.current[def.name + def.type]) {
|
||||||
|
msgRef.current[def.name + def.type] = true;
|
||||||
|
snackr.enqueueSnackbar(
|
||||||
|
<span>
|
||||||
|
"{def.name}" is of a unimplemented type "{def.type}"! <br />
|
||||||
|
Please report this to the maintainers.{" "}
|
||||||
|
<b>For now, we leave you with a generic textbox!</b> <br />
|
||||||
|
DEBUG="{JSON.stringify(def)}"
|
||||||
|
</span>,
|
||||||
|
{
|
||||||
|
variant: "warning",
|
||||||
|
persist: true,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<InputText {...prop} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
import { FC } from "react";
|
||||||
|
import { useHAEntities } from "haService/HAEntities";
|
||||||
|
import {
|
||||||
|
InputAutoComplete,
|
||||||
|
InputAutoCompletePropsBase,
|
||||||
|
} from "./InputAutoComplete";
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
|
||||||
|
export type InputEntityProps = InputAutoCompletePropsBase & {
|
||||||
|
restrictToDomain?: string[];
|
||||||
|
restrictedIntegrations?: string[];
|
||||||
|
preSelectedEntityIds?: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const InputEntity: FC<InputEntityProps> = (props) => {
|
||||||
|
// state
|
||||||
|
const entities = useHAEntities();
|
||||||
|
let options = entities.getOptions(
|
||||||
|
props.restrictToDomain,
|
||||||
|
props.restrictedIntegrations
|
||||||
|
);
|
||||||
|
if (props.preSelectedEntityIds) {
|
||||||
|
options = options.filter((opt) =>
|
||||||
|
props.preSelectedEntityIds?.includes(entities.getID(opt))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const validateOptions = (v: string[]): null | string[] => {
|
||||||
|
const errors: string[] = [];
|
||||||
|
if (props.preSelectedEntityIds) {
|
||||||
|
v.forEach((eid) => {
|
||||||
|
if (!props.preSelectedEntityIds?.includes(eid)) {
|
||||||
|
errors.push(`"${eid}" is not a valid selection`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
errors.concat(
|
||||||
|
entities.validateOptions(
|
||||||
|
v,
|
||||||
|
props.restrictToDomain,
|
||||||
|
props.restrictedIntegrations
|
||||||
|
) ?? []
|
||||||
|
);
|
||||||
|
if (errors.length > 0) {
|
||||||
|
return errors;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<InputAutoComplete
|
||||||
|
{...props}
|
||||||
|
validateOption={validateOptions}
|
||||||
|
options={options}
|
||||||
|
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,74 +1,79 @@
|
|||||||
import { FC } from "react";
|
import FormHelperText from "@mui/material/FormHelperText";
|
||||||
import FormHelperText from '@mui/material/FormHelperText';
|
import InputLabel from "@mui/material/InputLabel";
|
||||||
import InputLabel from '@mui/material/InputLabel';
|
import MenuItem from "@mui/material/MenuItem";
|
||||||
import MenuItem from '@mui/material/MenuItem';
|
import FormControl from "@mui/material/FormControl";
|
||||||
import FormControl from '@mui/material/FormControl';
|
import Select from "@mui/material/Select";
|
||||||
import Select from '@mui/material/Select';
|
import { prettyName } from "utils/formatting";
|
||||||
|
import { ReactNode } from "react";
|
||||||
|
|
||||||
export interface Props<T extends string> {
|
export type Props<T extends string | Object> = {
|
||||||
current: T;
|
current?: T;
|
||||||
options: readonly T[];
|
options: readonly T[];
|
||||||
onChange: (n: T) => void;
|
onChange: (n: T) => void;
|
||||||
label: string;
|
label: string;
|
||||||
id?: string;
|
id?: string;
|
||||||
className?: string;
|
className?: string;
|
||||||
}
|
prettyOptionLabels?: boolean;
|
||||||
export const InputList: FC<Props<any>> = ({
|
getKey?: (n: T) => string;
|
||||||
|
placeholder?: any;
|
||||||
|
title?: string;
|
||||||
|
helperText?: string;
|
||||||
|
endAdornment?: ReactNode;
|
||||||
|
disabled?: boolean;
|
||||||
|
};
|
||||||
|
export function InputList<T extends string | Object>({
|
||||||
current,
|
current,
|
||||||
options,
|
options,
|
||||||
onChange,
|
onChange,
|
||||||
label,
|
label,
|
||||||
id,
|
id,
|
||||||
className,
|
className,
|
||||||
}) => {
|
prettyOptionLabels = true,
|
||||||
const invalidCurrent = current && !options.includes(current);
|
getKey = String,
|
||||||
return <FormControl variant="filled" sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}>
|
placeholder,
|
||||||
<InputLabel id="demo-simple-select-filled-label">{label}</InputLabel>
|
title,
|
||||||
<Select
|
helperText,
|
||||||
|
endAdornment,
|
||||||
|
disabled,
|
||||||
|
}: Props<T>) {
|
||||||
|
const invalidCurrent =
|
||||||
|
current && !options.map(getKey).includes(getKey(current));
|
||||||
|
return (
|
||||||
|
<FormControl
|
||||||
className={className}
|
className={className}
|
||||||
autoWidth
|
|
||||||
id={id}
|
|
||||||
value={current}
|
|
||||||
onChange={(e) => {
|
|
||||||
onChange(e.target.value)
|
|
||||||
}}
|
|
||||||
label={label}
|
|
||||||
variant="filled"
|
variant="filled"
|
||||||
placeholder={label}
|
sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}
|
||||||
error={invalidCurrent}
|
fullWidth
|
||||||
|
disabled={disabled}
|
||||||
>
|
>
|
||||||
{options.map((t, i) => (
|
<InputLabel>{label}</InputLabel>
|
||||||
<MenuItem
|
<Select
|
||||||
key={i}
|
title={title}
|
||||||
value={t}
|
placeholder={placeholder ?? label}
|
||||||
>
|
endAdornment={endAdornment}
|
||||||
{t}
|
autoWidth
|
||||||
</MenuItem>
|
id={id}
|
||||||
))}
|
value={current ? getKey(current) : ""}
|
||||||
</Select>
|
onChange={(e) => {
|
||||||
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
|
const key = e.target.value;
|
||||||
</FormControl>
|
const option = options.filter((opt) => getKey(opt) === key)[0];
|
||||||
// return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
|
onChange(option);
|
||||||
// <select
|
}}
|
||||||
// title={invalidCurrent ? "Invalid Selection" : ""}
|
label={label}
|
||||||
// className={classes.input}
|
variant="filled"
|
||||||
// {...selattr} value={current}
|
error={invalidCurrent}
|
||||||
// onChange={e => {
|
fullWidth
|
||||||
// e.preventDefault();
|
disabled={disabled}
|
||||||
// if (e.currentTarget.id === 'invalid') {
|
>
|
||||||
// onChange(options[0])
|
{options.map((t, i) => (
|
||||||
// } else {
|
<MenuItem key={i} value={getKey(t)}>
|
||||||
// onChange(e.currentTarget.value as any);
|
{prettyOptionLabels ? prettyName(getKey(t)) : getKey(t)}
|
||||||
// }
|
</MenuItem>
|
||||||
// }}
|
))}
|
||||||
// >
|
</Select>
|
||||||
// {options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
|
<FormHelperText variant="filled" error={invalidCurrent}>
|
||||||
// {invalidCurrent ? <option
|
{invalidCurrent ? `'${current}' is not a valid selection` : helperText}
|
||||||
// id={'invalid'}
|
</FormHelperText>
|
||||||
// value={current}
|
</FormControl>
|
||||||
// style={{ display: 'none' }}
|
);
|
||||||
// >!{current}!</option> : <></>}
|
|
||||||
// </select>
|
|
||||||
// </InputWrapper>
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
.input-number .MuiButtonBase-root.icon-button[type="button"].icon-button {
|
||||||
|
border-style: none;
|
||||||
|
}
|
||||||
@@ -1,43 +1,86 @@
|
|||||||
import InputWrapper from "./InputWrapper";
|
import "./InputNumber.css";
|
||||||
import { useInputNumberStyles } from "./styles";
|
import Close from "@mui/icons-material/Close";
|
||||||
|
import TextField from "@mui/material/TextField";
|
||||||
|
import InputAdornment from "@mui/material/InputAdornment";
|
||||||
|
import Edit from "@mui/icons-material/Edit";
|
||||||
|
import { ReactNode } from "react";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
label: string;
|
label: string | JSX.Element;
|
||||||
value: number | undefined;
|
value: number | undefined;
|
||||||
onChange: (v: number | undefined) => void;
|
onChange: (v: number | undefined) => void;
|
||||||
className?: string;
|
className?: string;
|
||||||
min?: number,
|
min?: number;
|
||||||
max?: number,
|
max?: number;
|
||||||
step?: number,
|
step?: number;
|
||||||
|
unit?: string;
|
||||||
|
placeholder?: any;
|
||||||
|
required?: boolean;
|
||||||
|
title?: string;
|
||||||
|
helperText?: ReactNode;
|
||||||
|
endAdornment?: ReactNode;
|
||||||
}
|
}
|
||||||
export default function InputNumber({
|
export default function InputNumber({
|
||||||
label,
|
label,
|
||||||
value = undefined,
|
value = undefined,
|
||||||
onChange,
|
onChange,
|
||||||
className = "",
|
className = "",
|
||||||
min, max, step,
|
min,
|
||||||
|
max,
|
||||||
|
step,
|
||||||
|
unit,
|
||||||
|
placeholder,
|
||||||
|
required,
|
||||||
|
endAdornment,
|
||||||
|
helperText,
|
||||||
|
title,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const { classes } = useInputNumberStyles({});
|
const disabled = value === undefined || value === null;
|
||||||
return <InputWrapper className={className} label={label} labelSize={value !== undefined ? 'small' : 'normal'}>
|
let labelElm = <></>;
|
||||||
<input
|
let unitElm = <></>;
|
||||||
className={classes.input}
|
if (label) {
|
||||||
type="number"
|
labelElm = <span>{label}</span>;
|
||||||
value={value ?? ""}
|
}
|
||||||
onChange={e => {
|
if (unit) {
|
||||||
e.preventDefault();
|
unitElm = <small>({unit})</small>;
|
||||||
let v = Number(e.target.value);
|
}
|
||||||
if (max) {
|
|
||||||
v = Math.min(v, max)
|
return (
|
||||||
}
|
<TextField
|
||||||
if (min) {
|
variant="filled"
|
||||||
v = Math.max(v, min)
|
label={
|
||||||
}
|
<div className="input-number--label">
|
||||||
onChange(v)
|
{labelElm} {unitElm}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
title={title}
|
||||||
|
value={value}
|
||||||
|
onChange={(e) => onChange(Number(e.target.value ?? 0))}
|
||||||
|
disabled={disabled}
|
||||||
|
className={["input-number", className ?? ""].join(" ")}
|
||||||
|
placeholder={placeholder}
|
||||||
|
required={required}
|
||||||
|
fullWidth
|
||||||
|
helperText={helperText}
|
||||||
|
InputProps={{
|
||||||
|
endAdornment: endAdornment ? (
|
||||||
|
endAdornment
|
||||||
|
) : (
|
||||||
|
<InputAdornment position="end">
|
||||||
|
<ButtonIcon
|
||||||
|
onClick={() => onChange(disabled ? 0 : undefined)}
|
||||||
|
icon={disabled ? <Edit /> : <Close />}
|
||||||
|
/>
|
||||||
|
</InputAdornment>
|
||||||
|
),
|
||||||
|
inputProps: {
|
||||||
|
min,
|
||||||
|
max,
|
||||||
|
type: "number",
|
||||||
|
step,
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
step={step}
|
|
||||||
min={min}
|
|
||||||
max={max}
|
|
||||||
/>
|
/>
|
||||||
{value && <button className={classes.deleteIcon} onClick={() => onChange(undefined)}>X</button>}
|
);
|
||||||
</InputWrapper>
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { InputService } from "./InputService";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Inputs/InputService',
|
||||||
|
component: InputService,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
argTypes: {}
|
||||||
|
} as ComponentMeta<typeof InputService>;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof InputService> = args => {
|
||||||
|
const [value, setValue] = useState(args.value)
|
||||||
|
return <Page>
|
||||||
|
<div style={{
|
||||||
|
maxWidth: 200
|
||||||
|
}}>
|
||||||
|
<InputService {...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: ''
|
||||||
|
} as any
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { FC } from "react";
|
||||||
|
import { useHAServices } from 'haService';
|
||||||
|
import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
|
||||||
|
import { prettyName } from 'utils/formatting';
|
||||||
|
|
||||||
|
export type InputServiceProps = InputAutoCompletePropsBase & { multiple?: false };
|
||||||
|
|
||||||
|
export const InputService: FC<InputServiceProps> = props => {
|
||||||
|
const services = useHAServices();
|
||||||
|
return <InputAutoComplete
|
||||||
|
{...props}
|
||||||
|
label={props.label ?? "Service"}
|
||||||
|
options={services.getOptions()}
|
||||||
|
getID={services.getID}
|
||||||
|
getLabel={services.getLabel}
|
||||||
|
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,47 +1,73 @@
|
|||||||
import { PropsWithChildren, useState } from "react";
|
import React, { ReactNode, useState } from "react";
|
||||||
import { useToolTip } from "tooltip/context";
|
import { useToolTip } from "tooltip/context";
|
||||||
import TextField from '@mui/material/TextField';
|
import TextField from "@mui/material/TextField";
|
||||||
import InputWrapper from "./InputWrapper";
|
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
textBoxFor?: string;
|
textBoxFor?: string;
|
||||||
label: string;
|
label: string | JSX.Element;
|
||||||
value: string;
|
value: string;
|
||||||
onChange: (v: string) => void;
|
onChange: (v: string) => void;
|
||||||
onEnter?: () => void;
|
onEnter?: () => void;
|
||||||
additionalTooltipFilters?: Record<string, string>;
|
additionalTooltipFilters?: Record<string, string>;
|
||||||
multiline?: boolean;
|
multiline?: boolean;
|
||||||
maxRows?: number;
|
maxRows?: number;
|
||||||
|
className?: string;
|
||||||
|
placeholder?: any;
|
||||||
|
title?: string;
|
||||||
|
helperText?: ReactNode;
|
||||||
|
endAdornment?: ReactNode;
|
||||||
|
required?: boolean;
|
||||||
}
|
}
|
||||||
export default function InputText({
|
export default function InputText({
|
||||||
label,
|
label,
|
||||||
|
title,
|
||||||
|
helperText,
|
||||||
textBoxFor,
|
textBoxFor,
|
||||||
value = "",
|
value = "",
|
||||||
onChange,
|
onChange,
|
||||||
onEnter = () => { },
|
endAdornment,
|
||||||
|
onEnter = () => {},
|
||||||
additionalTooltipFilters = {},
|
additionalTooltipFilters = {},
|
||||||
multiline = false,
|
multiline = false,
|
||||||
maxRows = 4,
|
maxRows = 4,
|
||||||
children,
|
className,
|
||||||
}: PropsWithChildren<Props>) {
|
placeholder,
|
||||||
|
required,
|
||||||
|
}: Props) {
|
||||||
const tooltip = useToolTip();
|
const tooltip = useToolTip();
|
||||||
const [isFocused, setIsFocused] = useState(false)
|
const [isFocused, setIsFocused] = useState(false);
|
||||||
return <InputWrapper label="">
|
return (
|
||||||
<TextField multiline={multiline} maxRows={maxRows} fullWidth inputMode="text" variant="filled" focused={isFocused} label={label} value={value}
|
<TextField
|
||||||
onKeyDown={e => {
|
className={className}
|
||||||
if (e.key === 'Enter') {
|
multiline={multiline}
|
||||||
|
maxRows={maxRows}
|
||||||
|
fullWidth
|
||||||
|
inputMode="text"
|
||||||
|
variant="filled"
|
||||||
|
focused={isFocused}
|
||||||
|
label={label}
|
||||||
|
value={value}
|
||||||
|
title={title}
|
||||||
|
helperText={helperText}
|
||||||
|
placeholder={placeholder}
|
||||||
|
InputProps={{
|
||||||
|
endAdornment,
|
||||||
|
}}
|
||||||
|
required={required}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === "Enter") {
|
||||||
onEnter();
|
onEnter();
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
onChange={e => {
|
onChange={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
onChange(e.target.value)
|
onChange(e.target.value);
|
||||||
}}
|
}}
|
||||||
onBlur={() => {
|
onBlur={() => {
|
||||||
setIsFocused(false)
|
setIsFocused(false);
|
||||||
}}
|
}}
|
||||||
onFocus={e => {
|
onFocus={(e) => {
|
||||||
setIsFocused(true)
|
setIsFocused(true);
|
||||||
if (textBoxFor) {
|
if (textBoxFor) {
|
||||||
tooltip.setFocus(
|
tooltip.setFocus(
|
||||||
e.target.getBoundingClientRect(),
|
e.target.getBoundingClientRect(),
|
||||||
@@ -51,10 +77,9 @@ export default function InputText({
|
|||||||
filterObjects: additionalTooltipFilters,
|
filterObjects: additionalTooltipFilters,
|
||||||
},
|
},
|
||||||
onChange
|
onChange
|
||||||
)
|
);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{children}
|
);
|
||||||
</InputWrapper>
|
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|||||||
import { Page } from "components/Page";
|
import { Page } from "components/Page";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
|
||||||
import InputTextBubble, { InputEntity } from "./InputTextBubble";
|
import InputTextBubble from "./InputTextBubble";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'Inputs/InputTextBubble',
|
title: 'Inputs/InputTextBubble',
|
||||||
@@ -34,16 +34,6 @@ export const JustText: ComponentStory<typeof InputTextBubble> = args => {
|
|||||||
</Page>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export const EntityId: ComponentStory<typeof InputTextBubble> = args => {
|
|
||||||
|
|
||||||
const [value, setValue] = useState<string | string[]>(['sensor.bathroom'])
|
|
||||||
return <Page>
|
|
||||||
<InputEntity value={value} onChange={setValue} />
|
|
||||||
</Page>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const ManyOptions: ComponentStory<typeof InputTextBubble> = args => {
|
export const ManyOptions: ComponentStory<typeof InputTextBubble> = args => {
|
||||||
|
|
||||||
const [value, setValue] = useState<string | string[]>('hello')
|
const [value, setValue] = useState<string | string[]>('hello')
|
||||||
|
|||||||
@@ -1,32 +1,39 @@
|
|||||||
import Chip from "@mui/material/Chip";
|
import Chip from "@mui/material/Chip";
|
||||||
import TextField from "@mui/material/TextField";
|
import TextField from "@mui/material/TextField";
|
||||||
import Autocomplete from "@mui/material/Autocomplete";
|
import Autocomplete from "@mui/material/Autocomplete";
|
||||||
import { FC } from "react";
|
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
label: string;
|
label: string;
|
||||||
value: string | string[];
|
value?: string | string[];
|
||||||
options?: string[];
|
options?: string[];
|
||||||
onChange: (v: string[]) => void;
|
onChange: (v: string[]) => void;
|
||||||
|
maxAllowed?: number;
|
||||||
}
|
}
|
||||||
export default function InputTextBubble({
|
export default function InputTextBubble({
|
||||||
value = "",
|
value = "",
|
||||||
label,
|
label,
|
||||||
options = [],
|
options = [],
|
||||||
onChange,
|
onChange,
|
||||||
|
maxAllowed,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
|
|
||||||
const selected = Array.isArray(value) ? value : [value];
|
const selected = Array.isArray(value) ? value : value ? [value] : [];
|
||||||
|
|
||||||
return <Autocomplete
|
return <Autocomplete
|
||||||
multiple
|
multiple
|
||||||
freeSolo
|
freeSolo
|
||||||
value={selected}
|
value={selected}
|
||||||
options={options}
|
options={options}
|
||||||
onChange={(_e, v) => onChange(
|
onChange={(_e, v) => {
|
||||||
v === null ? [] :
|
let cleanValue = v === null ? [] :
|
||||||
Array.isArray(v) ? v : [v]
|
Array.isArray(v) ? v : [v]
|
||||||
)}
|
|
||||||
|
if (maxAllowed) {
|
||||||
|
cleanValue = cleanValue.slice(0, maxAllowed);
|
||||||
|
}
|
||||||
|
|
||||||
|
onChange(cleanValue)
|
||||||
|
}}
|
||||||
renderInput={params => <TextField
|
renderInput={params => <TextField
|
||||||
{...params}
|
{...params}
|
||||||
variant="filled"
|
variant="filled"
|
||||||
@@ -42,15 +49,3 @@ export default function InputTextBubble({
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const InputEntity: FC<{
|
|
||||||
value: string | string[];
|
|
||||||
onChange: (v: string[]) => void;
|
|
||||||
}> = ({
|
|
||||||
value,
|
|
||||||
onChange,
|
|
||||||
}) => <InputTextBubble
|
|
||||||
value={value}
|
|
||||||
onChange={onChange}
|
|
||||||
label="Entity ID"
|
|
||||||
/>
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
.input-time>.input-time--inner {
|
||||||
|
display: flex;
|
||||||
|
gap: 0;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-time>.input-time--inner>.icon-button {
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-time>.input-time--inner>.MuiFormControl-root {
|
||||||
|
width: 4em;
|
||||||
|
}
|
||||||
@@ -3,7 +3,7 @@ import { Page } from "components/Page";
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutomationTime } from "types/automations/common";
|
import { AutomationTime } from "types/automations/common";
|
||||||
|
|
||||||
import InputTime from "./InputTime";
|
import { InputTime } from "./InputTime";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'Inputs/InputTime',
|
title: 'Inputs/InputTime',
|
||||||
@@ -16,11 +16,19 @@ const Template: ComponentStory<typeof InputTime> = args => {
|
|||||||
|
|
||||||
const [value, setValue] = useState<AutomationTime | undefined>(undefined);
|
const [value, setValue] = useState<AutomationTime | undefined>(undefined);
|
||||||
return <Page>
|
return <Page>
|
||||||
<InputTime {...args} value={value} onChange={setValue} />
|
<div style={{
|
||||||
|
padding: '1em'
|
||||||
|
}}>
|
||||||
|
<InputTime {...args} value={value} onChange={t => {
|
||||||
|
setValue(t)
|
||||||
|
args.onChange(t)
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
</Page>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SimpleText = Template.bind({})
|
export const SimpleText = Template.bind({})
|
||||||
SimpleText.args = {
|
SimpleText.args = {
|
||||||
label: "Time Stamp",
|
label: "Time Stamp",
|
||||||
|
value: "10"
|
||||||
}
|
}
|
||||||
@@ -1,60 +1,150 @@
|
|||||||
import { PropsWithChildren, useState } from "react";
|
import "./InputTime.css";
|
||||||
|
import { useState, useEffect, FC } from "react";
|
||||||
|
import TextField from "@mui/material/TextField";
|
||||||
|
import EditIcon from "@mui/icons-material/Edit";
|
||||||
|
import CloseIcon from "@mui/icons-material/Close";
|
||||||
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
|
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
|
||||||
import { milisecondsToObject } from "utils/time";
|
import {
|
||||||
import InputWrapper from "./InputWrapper";
|
convertAutomationTimeToTimeObject,
|
||||||
import { useInputTimeStyles } from "./styles";
|
convertObjectToAutomationTimeString,
|
||||||
import { convertStringToAutomationTimeObject } from 'utils/time';
|
convertAutomationTimeToTimeString,
|
||||||
|
} from "utils/time";
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
|
||||||
|
// constants
|
||||||
|
const fields: Array<keyof AutomationTimeObject> = [
|
||||||
|
"hours",
|
||||||
|
"minutes",
|
||||||
|
"seconds",
|
||||||
|
"milliseconds",
|
||||||
|
];
|
||||||
export interface Props {
|
export interface Props {
|
||||||
textBoxFor?: string;
|
|
||||||
label: string;
|
label: string;
|
||||||
value?: AutomationTime;
|
value?: AutomationTime;
|
||||||
onChange: (v?: AutomationTimeObject) => void;
|
onChange: (v?: AutomationTimeObject) => void;
|
||||||
onEnter?: () => void;
|
className?: string;
|
||||||
}
|
}
|
||||||
export default function InputTime({
|
export const InputTime: FC<Props> = (props) => {
|
||||||
label,
|
// state
|
||||||
textBoxFor,
|
const [disabled, setDisabled] = useState(!props.value);
|
||||||
value = {},
|
const [displayValue, setDisplayValue] = useState(
|
||||||
onChange,
|
convertAutomationTimeToTimeObject(props.value)
|
||||||
onEnter = () => { },
|
);
|
||||||
children,
|
|
||||||
}: PropsWithChildren<Props>) {
|
// process display input
|
||||||
let cleanValue = '';
|
const updateOne = (k: keyof AutomationTimeObject) => (v: string) => {
|
||||||
if (value) {
|
if (Number(v) < 0) {
|
||||||
if (typeof value === 'string') {
|
setDisplayValue({
|
||||||
value = convertStringToAutomationTimeObject(value);
|
...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,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
const {
|
};
|
||||||
hours = 0,
|
|
||||||
minutes = 0,
|
// effect
|
||||||
seconds = 0,
|
useEffect(() => {
|
||||||
milliseconds = 0,
|
if (disabled && !props.value) {
|
||||||
} = value;
|
return;
|
||||||
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
|
}
|
||||||
}
|
if (disabled) {
|
||||||
const { classes } = useInputTimeStyles({});
|
props.onChange(undefined);
|
||||||
const [isFocused, setIsFocused] = useState(false)
|
} else {
|
||||||
return <InputWrapper className={classes.wrapper} label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
|
const pVal = convertAutomationTimeToTimeString(props.value);
|
||||||
<input
|
const cVal = convertObjectToAutomationTimeString(displayValue);
|
||||||
className={classes.input}
|
if (pVal !== cVal) {
|
||||||
type="time"
|
props.onChange(displayValue);
|
||||||
step={0.001}
|
}
|
||||||
value={cleanValue}
|
}
|
||||||
onKeyDown={e => {
|
// eslint-disable-next-line
|
||||||
if (e.key === 'Enter') {
|
}, [disabled, displayValue]);
|
||||||
onEnter();
|
|
||||||
}
|
return (
|
||||||
}}
|
<div className={["input-time", props.className ?? ""].join(" ")}>
|
||||||
onChange={e => {
|
{/* <InputLabel >{props.label}</InputLabel> */}
|
||||||
e.preventDefault();
|
<div className="input-time--inner">
|
||||||
onChange(milisecondsToObject(e.target.valueAsNumber))
|
{fields.map((name) => (
|
||||||
}}
|
<TextField
|
||||||
onBlur={e => {
|
key={name}
|
||||||
setIsFocused(false)
|
variant="filled"
|
||||||
}}
|
label={prettyName(name)}
|
||||||
/>
|
defaultValue="00"
|
||||||
<button onClick={() => onChange()} className={classes.cancel}>X</button>
|
InputProps={{
|
||||||
{children}
|
disabled,
|
||||||
</InputWrapper>
|
type: "number",
|
||||||
}
|
title: prettyName(name),
|
||||||
|
}}
|
||||||
|
value={displayValue[name] ?? 0}
|
||||||
|
onChange={(e) => updateOne(name)(e.target.value)}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
<ButtonIcon
|
||||||
|
onClick={() => setDisabled(!disabled)}
|
||||||
|
icon={disabled ? <EditIcon /> : <CloseIcon />}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FC } from "react";
|
import { FC, ReactNode } from "react";
|
||||||
import { useInputWrapperStyles } from "./styles";
|
import { useInputWrapperStyles } from "./styles";
|
||||||
|
|
||||||
|
|
||||||
@@ -7,7 +7,8 @@ export interface Props {
|
|||||||
labelSize?: 'normal' | 'small';
|
labelSize?: 'normal' | 'small';
|
||||||
noMargin?: boolean;
|
noMargin?: boolean;
|
||||||
className?: string;
|
className?: string;
|
||||||
error?: string;
|
error?: JSX.Element | string;
|
||||||
|
children: ReactNode;
|
||||||
}
|
}
|
||||||
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
|
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
|
||||||
const { classes } = useInputWrapperStyles({ labelSize, noMargin, hasError: !!error })
|
const { classes } = useInputWrapperStyles({ labelSize, noMargin, hasError: !!error })
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
.input-yaml {
|
||||||
|
align-items: flex-start;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-yaml label {
|
||||||
|
position: initial;
|
||||||
|
margin-bottom: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-yaml [lang=yaml] {
|
||||||
|
flex: 1;
|
||||||
|
width: 100%;
|
||||||
|
min-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-yaml .MuiFormHelperText-root {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
display: block;
|
||||||
|
overflow: hidden;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0.25em 0.1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-yaml .MuiInputAdornment-positionEnd {
|
||||||
|
position: absolute;
|
||||||
|
right: 0.5em;
|
||||||
|
top: 3.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-yaml .input-yaml--placeholder {
|
||||||
|
position: absolute;
|
||||||
|
left: 2em;
|
||||||
|
top: 2.5em;
|
||||||
|
color: var(--primary-accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-yaml .MuiButtonBase-root.icon-button[type="button"].icon-button {
|
||||||
|
border-style: none;
|
||||||
|
}
|
||||||
@@ -1,53 +1,116 @@
|
|||||||
|
import "./InputYaml.css";
|
||||||
import * as yaml from "js-yaml";
|
import * as yaml from "js-yaml";
|
||||||
import { useState } from "react";
|
import { useEffect, useState, ReactNode } from "react";
|
||||||
import { useDelayEffect } from 'utils/useDelay';
|
|
||||||
|
|
||||||
import CodeMirror from '@uiw/react-codemirror';
|
|
||||||
import InputWrapper from "./InputWrapper";
|
|
||||||
|
|
||||||
|
import CodeMirror from "@uiw/react-codemirror";
|
||||||
|
import FormControl from "@mui/material/FormControl";
|
||||||
|
import InputLabel from "@mui/material/InputLabel";
|
||||||
|
import FormHelperText from "@mui/material/FormHelperText";
|
||||||
|
import InputAdornment from "@mui/material/InputAdornment";
|
||||||
|
import { Save } from "@mui/icons-material";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
|
||||||
export interface Props<T extends {}> {
|
export interface Props<T extends {}> {
|
||||||
label: string;
|
label: string;
|
||||||
value: T;
|
value: T;
|
||||||
onChange: (v: T) => void;
|
onChange: (v: T) => void;
|
||||||
|
error?: JSX.Element | string;
|
||||||
|
className?: string;
|
||||||
|
placeholder?: any;
|
||||||
|
required?: boolean;
|
||||||
|
title?: string;
|
||||||
|
helperText?: ReactNode;
|
||||||
|
endAdornment?: ReactNode;
|
||||||
}
|
}
|
||||||
export default function InputYaml<T>({
|
export default function InputYaml<T extends {}>({
|
||||||
label,
|
label,
|
||||||
|
error: incmError,
|
||||||
value = {} as any,
|
value = {} as any,
|
||||||
onChange,
|
onChange,
|
||||||
|
className,
|
||||||
|
placeholder,
|
||||||
|
required,
|
||||||
|
title,
|
||||||
|
helperText,
|
||||||
|
endAdornment,
|
||||||
}: Props<T>) {
|
}: Props<T>) {
|
||||||
const [{ text, error }, setState] = useState<{
|
const [{ text, error, hasChanged }, setState] = useState<{
|
||||||
text: string,
|
text: string;
|
||||||
error: undefined | string,
|
error: undefined | JSX.Element | string;
|
||||||
|
hasChanged: boolean;
|
||||||
}>({
|
}>({
|
||||||
text: yaml.dump(value),
|
text: yaml.dump(value),
|
||||||
error: undefined
|
error: incmError,
|
||||||
|
hasChanged: false,
|
||||||
});
|
});
|
||||||
const setText = (t: string) => {
|
const setText = (t: string) => {
|
||||||
try {
|
try {
|
||||||
yaml.load(t)
|
yaml.load(t);
|
||||||
setState({ text: t, error: undefined })
|
setState({ text: t, error: undefined, hasChanged: true });
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
setState({ text: t, error: "! Invalid Yaml !" })
|
setState({ text: t, error: "! Invalid Yaml !", hasChanged: true });
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
useDelayEffect(() => {
|
const onSave = () => {
|
||||||
if (!error && (yaml.dump(value) !== text)) {
|
if (!error && yaml.dump(value) !== text) {
|
||||||
if (text) {
|
if (text) {
|
||||||
onChange(yaml.load(text) as any)
|
onChange(yaml.load(text) as any);
|
||||||
} else if (Array.isArray(value)) {
|
} else if (Array.isArray(value)) {
|
||||||
onChange([] as any)
|
onChange([] as any);
|
||||||
} else {
|
} else {
|
||||||
onChange({} as any)
|
onChange({} as any);
|
||||||
}
|
}
|
||||||
|
setState({
|
||||||
|
text,
|
||||||
|
error,
|
||||||
|
hasChanged: false,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}, [text], 1000)
|
};
|
||||||
return <InputWrapper label={label} error={error}>
|
useEffect(() => {
|
||||||
<CodeMirror
|
setState({
|
||||||
theme={"dark"}
|
text: yaml.dump(value),
|
||||||
value={text}
|
error: incmError,
|
||||||
lang="yaml"
|
hasChanged: false,
|
||||||
onChange={setText}
|
});
|
||||||
/>
|
}, [value, incmError]);
|
||||||
</InputWrapper>
|
return (
|
||||||
|
<FormControl
|
||||||
|
className={["input-yaml", className ?? ""].join(" ")}
|
||||||
|
fullWidth
|
||||||
|
title={title}
|
||||||
|
>
|
||||||
|
<InputLabel>
|
||||||
|
{label} {required ? "*" : ""}
|
||||||
|
</InputLabel>
|
||||||
|
<CodeMirror
|
||||||
|
theme={"dark"}
|
||||||
|
value={text}
|
||||||
|
lang="yaml"
|
||||||
|
onChange={setText}
|
||||||
|
maxWidth="100%"
|
||||||
|
width="100%"
|
||||||
|
minWidth="100%"
|
||||||
|
/>
|
||||||
|
<span className="input-yaml--placeholder">
|
||||||
|
{!!text ? "" : placeholder}
|
||||||
|
</span>
|
||||||
|
<InputAdornment position="end">
|
||||||
|
<ButtonIcon
|
||||||
|
disabled={!hasChanged}
|
||||||
|
onClick={() => onSave()}
|
||||||
|
title={!!error ? "Invalid YAML" : hasChanged ? "Save" : ""}
|
||||||
|
icon={
|
||||||
|
<Save
|
||||||
|
color={hasChanged ? (!!error ? "error" : "success") : "disabled"}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
{endAdornment}
|
||||||
|
</InputAdornment>
|
||||||
|
<FormHelperText variant="filled" error={!!error}>
|
||||||
|
{error ? error : helperText}
|
||||||
|
</FormHelperText>
|
||||||
|
</FormControl>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
|
import { SearchItem } from "./extras";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: "Inputs/Extras/SearchItem",
|
||||||
|
component: SearchItem,
|
||||||
|
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||||
|
argTypes: {},
|
||||||
|
} as ComponentMeta<typeof SearchItem>;
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof SearchItem> = (args) => {
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
width: "15em",
|
||||||
|
height: "3em",
|
||||||
|
border: "1px solid var(--primary-accent)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<SearchItem {...args} />
|
||||||
|
</div>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const Simple = Template.bind({});
|
||||||
|
Simple.args = {
|
||||||
|
id: "sensor.humidity_main_bedroom",
|
||||||
|
label: "Main Bedroom Humidity",
|
||||||
|
searchTerm: "bedroom",
|
||||||
|
listProps: {},
|
||||||
|
onlyShowLabel: false,
|
||||||
|
};
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
.input-extras--search-item--list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0;
|
||||||
|
|
||||||
|
justify-content: center;
|
||||||
|
align-items: flex-start !important;
|
||||||
|
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
|
||||||
|
min-height: 2em;
|
||||||
|
max-height: 100%;
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
min-width: 100%;
|
||||||
|
max-width: 20em;
|
||||||
|
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-extras--search-item--list small {
|
||||||
|
/* max-height: 2em; */
|
||||||
|
max-width: 100%;
|
||||||
|
width: fit-content;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-extras--search-item--list b {
|
||||||
|
max-height: 1.5em;
|
||||||
|
width: fit-content;
|
||||||
|
max-width: 100%;
|
||||||
|
padding-right: 0.25em;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* .input-extras--search-item--list>small::before {
|
||||||
|
content: "/ ";
|
||||||
|
} */
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
import "./extras.css";
|
||||||
|
import { FC } from "react";
|
||||||
|
import parse from "autosuggest-highlight/parse";
|
||||||
|
import match from "autosuggest-highlight/match";
|
||||||
|
|
||||||
|
export const HighlightElm: FC<{
|
||||||
|
text: string;
|
||||||
|
searchTerm: string;
|
||||||
|
}> = ({ text, searchTerm }) => {
|
||||||
|
const matches = match(text, searchTerm, {
|
||||||
|
findAllOccurrences: true,
|
||||||
|
insideWords: true,
|
||||||
|
});
|
||||||
|
const parts = parse(text, matches);
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{parts.map((part, index) => (
|
||||||
|
<span
|
||||||
|
key={index}
|
||||||
|
style={{
|
||||||
|
textDecoration: part.highlight ? "underline" : "unset",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{part.text}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const SearchItem: FC<{
|
||||||
|
listProps: React.HTMLAttributes<HTMLLIElement>;
|
||||||
|
label: string;
|
||||||
|
id: string;
|
||||||
|
searchTerm: string;
|
||||||
|
onlyShowLabel?: boolean;
|
||||||
|
}> = ({ listProps, label, id, searchTerm, onlyShowLabel = false }) => {
|
||||||
|
const labelElm = (
|
||||||
|
<b className="input-extras--search-item--list--label">
|
||||||
|
<HighlightElm text={label} searchTerm={searchTerm} />
|
||||||
|
</b>
|
||||||
|
);
|
||||||
|
const idElm = (
|
||||||
|
<small className="input-extras--search-item--list--id">
|
||||||
|
<HighlightElm text={id} searchTerm={searchTerm} />
|
||||||
|
</small>
|
||||||
|
);
|
||||||
|
|
||||||
|
let inner = (
|
||||||
|
<>
|
||||||
|
{labelElm}
|
||||||
|
{idElm}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
|
||||||
|
if (onlyShowLabel) {
|
||||||
|
if (label) {
|
||||||
|
inner = labelElm;
|
||||||
|
} else {
|
||||||
|
inner = idElm;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li
|
||||||
|
{...listProps}
|
||||||
|
className={[
|
||||||
|
listProps.className ?? "",
|
||||||
|
"input-extras--search-item--list",
|
||||||
|
].join(" ")}
|
||||||
|
>
|
||||||
|
{inner}
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
};
|
||||||
Loaded 100 of 163 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user