Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 .
|
||||||
+28
-2
@@ -1,6 +1,32 @@
|
|||||||
# Changelog
|
# Changelog 
|
||||||
|
|
||||||
## [0.1.14] - Material UI + Autocomplete v2
|
## [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
|
||||||
|
|||||||
+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.21
|
||||||
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,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,7 +2,7 @@ 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 { Button } from "components/Inputs/Button";
|
||||||
import InputAutoText from "components/Inputs/InputAutoText";
|
import InputAutoText from "components/Inputs/InputAutoText";
|
||||||
@@ -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,
|
||||||
@@ -102,7 +103,7 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
<div className="automation-editor--info-box--tags">
|
<div className="automation-editor--info-box--tags">
|
||||||
<h1>Tags</h1>
|
<h1>Tags</h1>
|
||||||
<div className="automation-editor--info-box--tag-list">
|
<div className="automation-editor--info-box--tag-list">
|
||||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
{tags.map(([tagName, tagValue], tagIndex) => <div key={tagIndex} className="automation-editor--info-box--tag">
|
||||||
<InputAutoText
|
<InputAutoText
|
||||||
value={tagName}
|
value={tagName}
|
||||||
label="Name"
|
label="Name"
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
.automation-editor {
|
.automation-editor {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
position: relative;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -27,13 +28,9 @@
|
|||||||
.automation-editor--flow-wrapper--toolbar {
|
.automation-editor--flow-wrapper--toolbar {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
|
gap: 0.25em;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
margin-top: 0.25em;
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
|
||||||
height: 0;
|
|
||||||
opacity: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
||||||
@@ -75,3 +72,25 @@
|
|||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.automation-editor.loading .mock-list {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
width: 40%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.automation-editor.loading .mock-graph {
|
||||||
|
position: absolute;
|
||||||
|
left: 40%;
|
||||||
|
width: 60%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor .linear-loader {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
@@ -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,6 +1,7 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
|
import Icon from '@mui/material/Icon';
|
||||||
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
|
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
|
||||||
import { FC, useState } from "react";
|
import { FC, useEffect, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
@@ -11,6 +12,8 @@ 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";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
automation?: AutomationData;
|
automation?: AutomationData;
|
||||||
@@ -35,13 +38,23 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
save,
|
save,
|
||||||
saveAndUpdate,
|
saveAndUpdate,
|
||||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||||
|
|
||||||
const [closeInfo, setCloseInfo] = useState(false);
|
const [closeInfo, setCloseInfo] = useState(false);
|
||||||
|
const [flipped, setFlipped] = useState(dims.flipped);
|
||||||
|
|
||||||
|
// effect
|
||||||
|
useEffect(() => {
|
||||||
|
if (dims.flipped !== flipped) {
|
||||||
|
setFlipped(dims.flipped)
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line
|
||||||
|
}, [dims.flipped])
|
||||||
|
|
||||||
// render
|
// render
|
||||||
if (state.status === 'loading') {
|
if (state.status === 'loading') {
|
||||||
return <div className="automation-editor loading">
|
return <div className="automation-editor loading">
|
||||||
Loading...
|
<LinearProgress className="linear-loader" />
|
||||||
|
<Skeleton className="mock-list" variant="rectangular" />
|
||||||
|
<Skeleton className="mock-graph" variant="rectangular" />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
if (state.status === 'invalid') {
|
if (state.status === 'invalid') {
|
||||||
@@ -53,6 +66,7 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
return <div className="automation-editor">
|
return <div className="automation-editor">
|
||||||
|
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
className={closeInfo ? "hide" : "show"}
|
className={closeInfo ? "hide" : "show"}
|
||||||
metadata={state.data.metadata}
|
metadata={state.data.metadata}
|
||||||
@@ -64,11 +78,19 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
className="automation-editor--info-box--icon"
|
className="automation-editor--info-box--icon"
|
||||||
onClick={() => setCloseInfo(!closeInfo)}
|
onClick={() => setCloseInfo(!closeInfo)}
|
||||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
||||||
>{ArrowIcon}</ButtonIcon>
|
Icon={ArrowIcon}
|
||||||
|
/>
|
||||||
</AutoInfoBox>
|
</AutoInfoBox>
|
||||||
|
|
||||||
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
||||||
<div className="automation-editor--flow-wrapper--toolbar">
|
<div className="automation-editor--flow-wrapper--toolbar">
|
||||||
|
{!dims.flipped && <Button
|
||||||
|
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
|
||||||
|
onClick={() => setFlipped(!flipped)}
|
||||||
|
>
|
||||||
|
<Icon>{flipped ? 'flip_to_front' : 'flip_to_back'}</Icon>
|
||||||
|
Flip
|
||||||
|
</Button>}
|
||||||
<Button
|
<Button
|
||||||
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
||||||
onClick={save}
|
onClick={save}
|
||||||
@@ -85,7 +107,10 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
onSequenceUpdate={updateSequence}
|
onSequenceUpdate={updateSequence}
|
||||||
onTriggerUpdate={updateTrigger}
|
onTriggerUpdate={updateTrigger}
|
||||||
onConditionUpdate={updateCondition}
|
onConditionUpdate={updateCondition}
|
||||||
dims={dims}
|
dims={{
|
||||||
|
...dims,
|
||||||
|
flipped,
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { MiniFailure } from '../../types/validators/helper';
|
|||||||
|
|
||||||
export type EditorData = ReturnType<typeof genEditorData>;
|
export type EditorData = ReturnType<typeof genEditorData>;
|
||||||
export type EditorState = {
|
export type EditorState = {
|
||||||
status: 'unchanged' | 'changed',
|
status: 'unchanged' | 'changed' | 'saving',
|
||||||
data: EditorData
|
data: EditorData
|
||||||
} | {
|
} | {
|
||||||
status: 'loading'
|
status: 'loading'
|
||||||
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
|
|||||||
}), {})
|
}), {})
|
||||||
};
|
};
|
||||||
update({
|
update({
|
||||||
status: "loading",
|
status: "saving",
|
||||||
|
data,
|
||||||
})
|
})
|
||||||
onSave(cleanData);
|
onSave(cleanData);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,11 +1,12 @@
|
|||||||
import "./AutomationListBox.css";
|
import "./AutomationListBox.css";
|
||||||
import { FC, useState } from 'react';
|
import { FC, useState } from 'react';
|
||||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import { 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 = {
|
||||||
@@ -16,6 +17,39 @@ export type Props = {
|
|||||||
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,
|
||||||
@@ -25,9 +59,13 @@ export const AutomationListBox: FC<Props> = ({
|
|||||||
}) => {
|
}) => {
|
||||||
|
|
||||||
const tags = getTagList(automations);
|
const tags = getTagList(automations);
|
||||||
const [searchText, setSearchText] = useState('');
|
const {
|
||||||
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
searchText,
|
||||||
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
setSearchText,
|
||||||
|
selectedTagIdx,
|
||||||
|
setSelectedTagIdx,
|
||||||
|
} = useAutomationListBoxState();
|
||||||
|
const filteredAutomations = filterAutomations(automations, searchText.toLowerCase(), selectedTagIdx, tags);
|
||||||
const grouping = makeGrouping(
|
const grouping = makeGrouping(
|
||||||
filteredAutomations.map(([a, _]) => a),
|
filteredAutomations.map(([a, _]) => a),
|
||||||
selectedTagIdx.map(i => tags[i]),
|
selectedTagIdx.map(i => tags[i]),
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -68,3 +68,11 @@
|
|||||||
background-color: var(--green-opaque);
|
background-color: var(--green-opaque);
|
||||||
z-index: 30;
|
z-index: 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
||||||
|
height: 0;
|
||||||
|
opacity: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import "./index.mobile.css";
|
import "./index.mobile.css";
|
||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { FC, useState } from "react";
|
import { FC, ReactNode, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { defaultAutomation } from 'utils/defaults';
|
import { defaultAutomation } from 'utils/defaults';
|
||||||
import { ArrowIcon } from "components/Icons";
|
import { ArrowIcon } from "components/Icons";
|
||||||
@@ -11,6 +11,10 @@ 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";
|
||||||
|
|
||||||
|
|
||||||
interface AutomationListParams {
|
interface AutomationListParams {
|
||||||
@@ -19,6 +23,33 @@ 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> = ({
|
||||||
@@ -30,8 +61,7 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
children,
|
children,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [hideList, setHideList] = useState(false);
|
const { hideList, setHideList, current, setCurrent } = useAutomationListState();
|
||||||
const [current, setCurrent] = useState(0);
|
|
||||||
const { isMobile } = useWindowSize();
|
const { isMobile } = useWindowSize();
|
||||||
// alias
|
// alias
|
||||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
const currentAuto = automations.length > 0 ? automations[current] : null;
|
||||||
@@ -57,15 +87,17 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
onClick={() => setHideList(!hideList)}
|
onClick={() => setHideList(!hideList)}
|
||||||
className="automation-list--list-hide"
|
className="automation-list--list-hide"
|
||||||
>
|
Icon={ArrowIcon}
|
||||||
{ArrowIcon}
|
/>
|
||||||
</ButtonIcon>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list--viewer">
|
<div className="automation-list--viewer">
|
||||||
{currentAuto ? <AutomationEditor
|
{currentAuto ? <AutomationEditor
|
||||||
automation={currentAuto}
|
automation={currentAuto}
|
||||||
onUpdate={a => onUpdate(current, a)}
|
onUpdate={a => onUpdate(current, a)}
|
||||||
dims={dims}
|
dims={{
|
||||||
|
...dims,
|
||||||
|
flipped: isMobile
|
||||||
|
}}
|
||||||
tagDB={tagDB}
|
tagDB={tagDB}
|
||||||
/> : <></>}
|
/> : <></>}
|
||||||
</div>
|
</div>
|
||||||
@@ -82,13 +114,28 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
|||||||
state: {
|
state: {
|
||||||
automations,
|
automations,
|
||||||
},
|
},
|
||||||
removeAutomation,
|
...methods
|
||||||
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>
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import InputYaml from "components/Inputs/InputYaml";
|
|||||||
import { getEditor } from "./editorRender";
|
import { getEditor } from "./editorRender";
|
||||||
import { useStyles } from "./style";
|
import { useStyles } from "./style";
|
||||||
import { getViewer } from "./viewRender";
|
import { getViewer } from "./viewRender";
|
||||||
|
import useWindowSize from "utils/useWindowSize";
|
||||||
|
import { useHA } from "haService";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -31,6 +33,8 @@ export const ConditionNode: FC<{
|
|||||||
// state
|
// state
|
||||||
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
||||||
const [yamlMode, setYamlMode] = useState(false);
|
const [yamlMode, setYamlMode] = useState(false);
|
||||||
|
const { isMobile } = useWindowSize();
|
||||||
|
const { namer } = useHA();
|
||||||
// alias
|
// alias
|
||||||
const effectiveDM = internalDisplayMode || yamlMode;
|
const effectiveDM = internalDisplayMode || yamlMode;
|
||||||
// effect
|
// effect
|
||||||
@@ -62,7 +66,7 @@ export const ConditionNode: FC<{
|
|||||||
let childrenConditions: JSX.Element;
|
let childrenConditions: JSX.Element;
|
||||||
if (effectiveDM) {
|
if (effectiveDM) {
|
||||||
const Viewer = getViewer(condition);
|
const Viewer = getViewer(condition);
|
||||||
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
|
childrenConditions = <Viewer condition={condition} onChange={onUpdate} namer={namer} />
|
||||||
} else {
|
} else {
|
||||||
const Editor = getEditor(condition);
|
const Editor = getEditor(condition);
|
||||||
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
|
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
|
||||||
@@ -76,54 +80,56 @@ export const ConditionNode: FC<{
|
|||||||
} else if (condition.condition === 'or') {
|
} else if (condition.condition === 'or') {
|
||||||
hasChildren = true
|
hasChildren = true
|
||||||
}
|
}
|
||||||
const { classes } = useStyles({ hasChildren });
|
const { classes } = useStyles({ hasChildren, isMobile });
|
||||||
|
|
||||||
// components
|
// components
|
||||||
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
||||||
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
||||||
|
|
||||||
return <div className={classes.root}>
|
return <div className={classes.root}>
|
||||||
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
<>
|
||||||
<div className={classes.title}>
|
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
||||||
<InputList
|
<div className={classes.title}>
|
||||||
label=""
|
<InputList
|
||||||
className={classes.titleText}
|
label=""
|
||||||
current={condition.condition}
|
className={classes.titleText}
|
||||||
options={[
|
current={condition.condition}
|
||||||
'or', 'not', 'and',
|
options={[
|
||||||
'template',
|
'or', 'not', 'and',
|
||||||
'numeric_state',
|
'template',
|
||||||
'state',
|
'numeric_state',
|
||||||
'time',
|
'state',
|
||||||
'trigger',
|
'time',
|
||||||
'zone',
|
'trigger',
|
||||||
]}
|
'zone',
|
||||||
onChange={(n: any) => onUpdate({
|
]}
|
||||||
...getConditionDefaultValues(n),
|
onChange={(n: any) => onUpdate({
|
||||||
...condition,
|
...getConditionDefaultValues(n),
|
||||||
condition: n,
|
...condition,
|
||||||
} as any)}
|
condition: n,
|
||||||
/>
|
} as any)}
|
||||||
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
/>
|
||||||
{yamlMode ? 'visual' : 'yaml'}
|
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
||||||
</button>}
|
{yamlMode ? 'visual' : 'yaml'}
|
||||||
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
</button>}
|
||||||
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
||||||
</button>}
|
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
||||||
</div>
|
</button>}
|
||||||
<div className={classes.children}>
|
|
||||||
{yamlMode && <InputYaml
|
|
||||||
label=""
|
|
||||||
value={condition}
|
|
||||||
onChange={update => onUpdate(update as any)}
|
|
||||||
/>}
|
|
||||||
<div className={classes.conditionWrap}>
|
|
||||||
{!yamlMode && childrenConditions}
|
|
||||||
</div>
|
</div>
|
||||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
<div className={classes.children}>
|
||||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
{yamlMode && <InputYaml
|
||||||
</div>}
|
label=""
|
||||||
</div>
|
value={condition}
|
||||||
{children({ classes })}
|
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>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -2,10 +2,10 @@ import { FC } from "react";
|
|||||||
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
||||||
import 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";
|
||||||
|
|
||||||
|
|
||||||
@@ -60,6 +60,7 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
|||||||
return <>
|
return <>
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
@@ -120,6 +121,7 @@ export const StateEditor: Editor<StateCondition> = ({
|
|||||||
return <>
|
return <>
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
@@ -196,6 +198,7 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
|
|||||||
})} />
|
})} />
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
|
|||||||
@@ -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,12 +1,13 @@
|
|||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
|
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
|
||||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
|
||||||
import { ConditionNode } from "./ConditionNode";
|
import { ConditionNode } from "./ConditionNode";
|
||||||
import { genUpdateMethods } from "./nestedUpdater";
|
import { genUpdateMethods } from "./nestedUpdater";
|
||||||
|
|
||||||
|
|
||||||
interface Viewer<C extends AutomationCondition> extends FC<{
|
interface Viewer<C extends AutomationCondition> extends FC<{
|
||||||
condition: C;
|
condition: C;
|
||||||
|
namer: Namer;
|
||||||
onChange: (condition: C) => void;
|
onChange: (condition: C) => void;
|
||||||
}> { }
|
}> { }
|
||||||
|
|
||||||
@@ -23,9 +24,10 @@ export const getViewer = (condition: AutomationCondition): Viewer<any> => {
|
|||||||
|
|
||||||
export const GenericViewer: Viewer<AutomationCondition> = ({
|
export const GenericViewer: Viewer<AutomationCondition> = ({
|
||||||
condition,
|
condition,
|
||||||
|
namer,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return <>
|
||||||
{getDescriptionFromAutomationNode(condition)}
|
{getDescriptionFromAutomationNode(condition, namer)}
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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": [
|
||||||
{
|
{
|
||||||
@@ -232,3 +238,26 @@ Errors.args = {
|
|||||||
} as any
|
} as any
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const ComplexFlipped = Complex.bind({})
|
||||||
|
|
||||||
|
ComplexFlipped.args = {
|
||||||
|
...Complex.args,
|
||||||
|
dims: {
|
||||||
|
...dgconst.DEFAULT_DIMS,
|
||||||
|
...Complex.args.dims,
|
||||||
|
flipped: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const SimpleFlipped = Simple.bind({})
|
||||||
|
|
||||||
|
SimpleFlipped.args = {
|
||||||
|
...Simple.args,
|
||||||
|
dims: {
|
||||||
|
...dgconst.DEFAULT_DIMS,
|
||||||
|
...Complex.args.dims,
|
||||||
|
flipped: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,6 +16,7 @@ import { AutomationCondition } from "types/automations/conditions";
|
|||||||
import { makeConditionPoint } from "./flowDataMods";
|
import { makeConditionPoint } from "./flowDataMods";
|
||||||
import { convertToFlowNode } from "./helpers";
|
import { convertToFlowNode } from "./helpers";
|
||||||
import { DAGErrorNode } from "./DAGErrorNode";
|
import { DAGErrorNode } from "./DAGErrorNode";
|
||||||
|
import { useHA } from "haService";
|
||||||
|
|
||||||
const nodeTypes = {
|
const nodeTypes = {
|
||||||
'dagnode': convertToFlowNode(DAGNode),
|
'dagnode': convertToFlowNode(DAGNode),
|
||||||
@@ -57,7 +58,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
|||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [modalState, setModalState] = useState<ModalState | null>(null);
|
const [modalState, setModalState] = useState<ModalState | null>(null);
|
||||||
|
const { namer, } = useHA();
|
||||||
// modal
|
// modal
|
||||||
let modalBody = <></>
|
let modalBody = <></>
|
||||||
if (modalState) {
|
if (modalState) {
|
||||||
@@ -66,7 +67,10 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
|||||||
node={modalState.node}
|
node={modalState.node}
|
||||||
isErrored={modalState.isError}
|
isErrored={modalState.isError}
|
||||||
onClose={() => setModalState(null)}
|
onClose={() => setModalState(null)}
|
||||||
onSave={n => { modalState.update(n as any); setModalState(null); }}
|
onSave={n => {
|
||||||
|
modalState.update(n as any);
|
||||||
|
setModalState(null);
|
||||||
|
}}
|
||||||
allowedTypes={modalState.allowedTypes}
|
allowedTypes={modalState.allowedTypes}
|
||||||
saveBtnCreateText={modalState.saveBtnCreateText}
|
saveBtnCreateText={modalState.saveBtnCreateText}
|
||||||
/>
|
/>
|
||||||
@@ -81,7 +85,11 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
// convert automation to flow data
|
// convert automation to flow data
|
||||||
const condPoint = makeConditionPoint('c', {
|
const condPoint = makeConditionPoint(
|
||||||
|
'c', dims.flipped ? {
|
||||||
|
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: dims.padding.x + dims.nodeWidth * 0.25
|
||||||
|
} : {
|
||||||
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
|
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
y: dims.padding.y + dims.nodeHeight * 0.25
|
y: dims.padding.y + dims.nodeHeight * 0.25
|
||||||
}, dims, condition.length, makeOnEditAutomationConditions(
|
}, dims, condition.length, makeOnEditAutomationConditions(
|
||||||
@@ -94,6 +102,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
|||||||
edges: [],
|
edges: [],
|
||||||
}
|
}
|
||||||
triggerToFlow(flowData, trigger, condPoint.id, dims, {
|
triggerToFlow(flowData, trigger, condPoint.id, dims, {
|
||||||
|
namer,
|
||||||
onAdd: () => onTriggerUpdate([
|
onAdd: () => onTriggerUpdate([
|
||||||
...trigger, {
|
...trigger, {
|
||||||
platform: 'event',
|
platform: 'event',
|
||||||
@@ -120,13 +129,27 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
|||||||
sequence,
|
sequence,
|
||||||
condPoint.id,
|
condPoint.id,
|
||||||
{
|
{
|
||||||
...dims, padding: {
|
...dims, padding: dims.flipped ? {
|
||||||
|
y: condPoint.position.y - dims.nodeHeight - dims.conditionHeight,
|
||||||
|
x: dims.padding.x,
|
||||||
|
} : {
|
||||||
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
|
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
|
||||||
y: dims.padding.y,
|
y: dims.padding.y,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
namer,
|
||||||
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
||||||
);
|
);
|
||||||
|
// this fixes some strange edge drawing issue
|
||||||
|
flowData.edges = flowData.edges.map(e => ({
|
||||||
|
...e,
|
||||||
|
"source": `${e.source}-${dims.flipped}`,
|
||||||
|
"target": `${e.target}-${dims.flipped}`,
|
||||||
|
}))
|
||||||
|
flowData.nodes = flowData.nodes.map(n => ({
|
||||||
|
...n,
|
||||||
|
id: `${n.id}-${dims.flipped}`
|
||||||
|
}))
|
||||||
// render
|
// render
|
||||||
return <>
|
return <>
|
||||||
<Modal open={!!modalState}>
|
<Modal open={!!modalState}>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { AutomationSequenceNode } from 'types/automations';
|
import { AutomationSequenceNode } from 'types/automations';
|
||||||
import { DAGAutomationFlowDims, FlowData } from './types';
|
import { DAGAutomationFlowDims, FlowData } from './types';
|
||||||
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
import { getDescriptionFromAutomationNode, Namer } from 'utils/formatting';
|
||||||
import { XYPosition } from 'react-flow-renderer';
|
import { XYPosition } from 'react-flow-renderer';
|
||||||
import { ChooseAction } from 'types/automations/actions';
|
import { ChooseAction } from 'types/automations/actions';
|
||||||
import { makeFlowCircle } from './DAGCircle';
|
import { makeFlowCircle } from './DAGCircle';
|
||||||
@@ -14,6 +14,7 @@ export const sequenceToFlow = (
|
|||||||
sequence: AutomationSequenceNode[],
|
sequence: AutomationSequenceNode[],
|
||||||
fromPoint: string,
|
fromPoint: string,
|
||||||
dims: DAGAutomationFlowDims,
|
dims: DAGAutomationFlowDims,
|
||||||
|
namer: Namer,
|
||||||
updater: SequenceUpdater,
|
updater: SequenceUpdater,
|
||||||
prefix: string = "",
|
prefix: string = "",
|
||||||
) => {
|
) => {
|
||||||
@@ -25,12 +26,18 @@ export const sequenceToFlow = (
|
|||||||
const nodeId = `${prefix}n-${i}`;
|
const nodeId = `${prefix}n-${i}`;
|
||||||
let position: XYPosition;
|
let position: XYPosition;
|
||||||
if (lasPos) {
|
if (lasPos) {
|
||||||
position = {
|
position = dims.flipped ? {
|
||||||
|
y: lasPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: dims.padding.x
|
||||||
|
} : {
|
||||||
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
|
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
y: dims.padding.y
|
y: dims.padding.y
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
position = {
|
position = dims.flipped ? {
|
||||||
|
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor * (i + 2),
|
||||||
|
x: dims.padding.x
|
||||||
|
} : {
|
||||||
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
|
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
|
||||||
y: dims.padding.y
|
y: dims.padding.y
|
||||||
};
|
};
|
||||||
@@ -39,7 +46,7 @@ export const sequenceToFlow = (
|
|||||||
if (getNodeType(node) === 'action') {
|
if (getNodeType(node) === 'action') {
|
||||||
if ('choose' in node) {
|
if ('choose' in node) {
|
||||||
try {
|
try {
|
||||||
const out = addChooseNode(node, position, nodeId, dims, updater, i);
|
const out = addChooseNode(node, position, nodeId, dims, namer, updater, i);
|
||||||
position = out.lastPos
|
position = out.lastPos
|
||||||
flowData = mergeFlowDatas(flowData, out.flowData);
|
flowData = mergeFlowDatas(flowData, out.flowData);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -49,13 +56,15 @@ export const sequenceToFlow = (
|
|||||||
} else {
|
} else {
|
||||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
onXClick: () => updater.removeNode(i)
|
onXClick: () => updater.removeNode(i),
|
||||||
|
namer,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
onXClick: () => updater.removeNode(i)
|
onXClick: () => updater.removeNode(i),
|
||||||
|
namer,
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -67,7 +76,14 @@ export const sequenceToFlow = (
|
|||||||
// add button
|
// add button
|
||||||
const addCircle = makeAddButton(
|
const addCircle = makeAddButton(
|
||||||
`${prefix}-+`,
|
`${prefix}-+`,
|
||||||
{
|
dims.flipped ? {
|
||||||
|
y: (
|
||||||
|
lasPos === null ?
|
||||||
|
dims.padding.y + dims.nodeHeight * dims.distanceFactor * (sequence.length + 1) :
|
||||||
|
lasPos.y
|
||||||
|
) + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: dims.padding.x + dims.circleSize * 1.5
|
||||||
|
} : {
|
||||||
x: (
|
x: (
|
||||||
lasPos === null ?
|
lasPos === null ?
|
||||||
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
|
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
|
||||||
@@ -104,22 +120,25 @@ const addSingleNode = (
|
|||||||
position: XYPosition,
|
position: XYPosition,
|
||||||
nodeId: string,
|
nodeId: string,
|
||||||
{
|
{
|
||||||
|
flipped,
|
||||||
nodeHeight,
|
nodeHeight,
|
||||||
nodeWidth,
|
nodeWidth,
|
||||||
}: DAGAutomationFlowDims,
|
}: DAGAutomationFlowDims,
|
||||||
opts: {
|
opts: {
|
||||||
onEditClick: () => void;
|
onEditClick: () => void;
|
||||||
onXClick: () => void;
|
onXClick: () => void;
|
||||||
|
namer: Namer;
|
||||||
}
|
}
|
||||||
) => flowData.nodes.push({
|
) => flowData.nodes.push({
|
||||||
id: nodeId,
|
id: nodeId,
|
||||||
type: 'dagnode',
|
type: 'dagnode',
|
||||||
data: {
|
data: {
|
||||||
label: getDescriptionFromAutomationNode(node),
|
label: getDescriptionFromAutomationNode(node, opts.namer),
|
||||||
height: nodeHeight,
|
height: nodeHeight,
|
||||||
width: nodeWidth,
|
width: nodeWidth,
|
||||||
color: getNodeType(node) === 'action' ? 'green' : 'blue',
|
color: getNodeType(node) === 'action' ? 'green' : 'blue',
|
||||||
hasInput: true,
|
hasInput: true,
|
||||||
|
flipped,
|
||||||
...opts,
|
...opts,
|
||||||
},
|
},
|
||||||
position,
|
position,
|
||||||
@@ -156,6 +175,7 @@ const addChooseNode = (
|
|||||||
position: XYPosition,
|
position: XYPosition,
|
||||||
nodeId: string,
|
nodeId: string,
|
||||||
dims: DAGAutomationFlowDims,
|
dims: DAGAutomationFlowDims,
|
||||||
|
namer: Namer,
|
||||||
updater: SequenceUpdater,
|
updater: SequenceUpdater,
|
||||||
i: number,
|
i: number,
|
||||||
) => {
|
) => {
|
||||||
@@ -166,16 +186,21 @@ const addChooseNode = (
|
|||||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
onXClick: () => updater.removeNode(i),
|
onXClick: () => updater.removeNode(i),
|
||||||
|
namer,
|
||||||
});
|
});
|
||||||
let lastPos: XYPosition = position;
|
let lastPos: XYPosition = position;
|
||||||
// conditions
|
// conditions
|
||||||
node.choose.forEach(({ sequence, conditions }, j) => {
|
node.choose.forEach(({ sequence, conditions }, j) => {
|
||||||
const sequenceId = `${nodeId}.${j}`;
|
const sequenceId = `${nodeId}.${j}`;
|
||||||
// edit/delete circle
|
// edit/delete circle
|
||||||
const circle = makeFlowCircle(`${sequenceId}>delete`, {
|
const circle = makeFlowCircle(`${sequenceId}>delete`, dims.flipped ? {
|
||||||
|
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
} : {
|
||||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
}, {
|
}, {
|
||||||
|
flipped: dims.flipped,
|
||||||
size: dims.circleSize,
|
size: dims.circleSize,
|
||||||
onRemove: createOnRemoveForChooseNode(
|
onRemove: createOnRemoveForChooseNode(
|
||||||
node,
|
node,
|
||||||
@@ -187,7 +212,10 @@ const addChooseNode = (
|
|||||||
addEdge(flowData, nodeId, circle.id, true)
|
addEdge(flowData, nodeId, circle.id, true)
|
||||||
const condNode = makeConditionPoint(
|
const condNode = makeConditionPoint(
|
||||||
`${sequenceId}>cond`,
|
`${sequenceId}>cond`,
|
||||||
{
|
dims.flipped ? {
|
||||||
|
y: circle.position.y + dims.circleSize * dims.distanceFactor,
|
||||||
|
x: circle.position.x - dims.circleSize,
|
||||||
|
} : {
|
||||||
x: circle.position.x + dims.circleSize * dims.distanceFactor,
|
x: circle.position.x + dims.circleSize * dims.distanceFactor,
|
||||||
y: circle.position.y + dims.circleSize / 8,
|
y: circle.position.y + dims.circleSize / 8,
|
||||||
},
|
},
|
||||||
@@ -201,15 +229,24 @@ const addChooseNode = (
|
|||||||
// actual sub sequence
|
// actual sub sequence
|
||||||
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
|
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
|
||||||
...dims,
|
...dims,
|
||||||
padding: {
|
padding: dims.flipped ? {
|
||||||
|
y: condNode.position.y - dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: condNode.position.x - dims.conditionHeight / 2,
|
||||||
|
} : {
|
||||||
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
|
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
|
||||||
y: condNode.position.y - dims.conditionHeight / 2,
|
y: condNode.position.y - dims.conditionHeight / 2,
|
||||||
},
|
},
|
||||||
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
|
}, namer, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
|
||||||
if (lastPoint.position) {
|
if (lastPoint.position) {
|
||||||
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
||||||
} else {
|
} else {
|
||||||
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
|
lastPos = xyApply(lastPos, dims.flipped ? {
|
||||||
|
y: lastPos.y,
|
||||||
|
x: lastPos.x + dims.nodeWidth * dims.distanceFactor
|
||||||
|
} : {
|
||||||
|
x: lastPos.x,
|
||||||
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor
|
||||||
|
}, Math.max)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
const totalChildren = node.choose.length;
|
const totalChildren = node.choose.length;
|
||||||
@@ -217,7 +254,10 @@ const addChooseNode = (
|
|||||||
// add button
|
// add button
|
||||||
const addCirlce = makeAddButton(
|
const addCirlce = makeAddButton(
|
||||||
`${nodeId}>add`,
|
`${nodeId}>add`,
|
||||||
{
|
dims.flipped ? {
|
||||||
|
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
} : {
|
||||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
},
|
},
|
||||||
@@ -238,19 +278,25 @@ const addChooseNode = (
|
|||||||
addEdge(flowData, nodeId, addCirlce.id, true)
|
addEdge(flowData, nodeId, addCirlce.id, true)
|
||||||
|
|
||||||
// else
|
// else
|
||||||
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
|
const elseCircle = makeFlowCircle(`${nodeId}>else`, dims.flipped ? {
|
||||||
|
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
x: lastPos.x + dims.nodeWidth * dims.distanceFactor * 2,
|
||||||
|
} : {
|
||||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
|
||||||
}, { size: dims.circleSize })
|
}, { size: dims.circleSize, flipped: dims.flipped })
|
||||||
flowData.nodes.push(elseCircle)
|
flowData.nodes.push(elseCircle)
|
||||||
addEdge(flowData, nodeId, elseCircle.id, true)
|
addEdge(flowData, nodeId, elseCircle.id, true)
|
||||||
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
|
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
|
||||||
...dims,
|
...dims,
|
||||||
padding: {
|
padding: dims.flipped ? {
|
||||||
|
y: position.y,
|
||||||
|
x: elseCircle.position.x - 1.4 * dims.circleSize,
|
||||||
|
} : {
|
||||||
x: position.x - dims.nodeWidth,
|
x: position.x - dims.nodeWidth,
|
||||||
y: elseCircle.position.y - dims.circleSize / 4,
|
y: elseCircle.position.y - dims.circleSize / 4,
|
||||||
},
|
},
|
||||||
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
|
}, namer, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
|
||||||
if (lastPoint.position) {
|
if (lastPoint.position) {
|
||||||
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ export const triggerToFlow = (
|
|||||||
nodeWidth,
|
nodeWidth,
|
||||||
padding,
|
padding,
|
||||||
conditionHeight,
|
conditionHeight,
|
||||||
|
circleSize,
|
||||||
|
flipped,
|
||||||
} = dims;
|
} = dims;
|
||||||
// convert all triggers to dag nodes
|
// convert all triggers to dag nodes
|
||||||
trigger.forEach((t, i) => {
|
trigger.forEach((t, i) => {
|
||||||
@@ -24,14 +26,21 @@ export const triggerToFlow = (
|
|||||||
id: flowId,
|
id: flowId,
|
||||||
type: 'dagnode',
|
type: 'dagnode',
|
||||||
data: {
|
data: {
|
||||||
label: getDescriptionFromAutomationNode(t),
|
label: getDescriptionFromAutomationNode(t, opts.namer),
|
||||||
height: nodeHeight,
|
height: nodeHeight,
|
||||||
width: nodeWidth,
|
width: nodeWidth,
|
||||||
|
flipped,
|
||||||
color: 'red',
|
color: 'red',
|
||||||
onEditClick: () => opts.onEdit(i),
|
onEditClick: () => opts.onEdit(i),
|
||||||
onXClick: () => opts.onDelete(i),
|
onXClick: () => opts.onDelete(i),
|
||||||
},
|
},
|
||||||
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i }
|
position: flipped ? {
|
||||||
|
y: padding.y,
|
||||||
|
x: padding.x + nodeWidth * distanceFactor * i
|
||||||
|
} : {
|
||||||
|
x: padding.x,
|
||||||
|
y: padding.y + nodeHeight * distanceFactor * i
|
||||||
|
}
|
||||||
})
|
})
|
||||||
flowData.edges.push({
|
flowData.edges.push({
|
||||||
id: `e(${flowId})-(${toPoint})`,
|
id: `e(${flowId})-(${toPoint})`,
|
||||||
@@ -43,7 +52,10 @@ export const triggerToFlow = (
|
|||||||
// create a 'add button'
|
// create a 'add button'
|
||||||
flowData.nodes.push(makeAddButton(
|
flowData.nodes.push(makeAddButton(
|
||||||
'trigger-add',
|
'trigger-add',
|
||||||
{
|
flipped ? {
|
||||||
|
y: padding.y + circleSize / 4,
|
||||||
|
x: padding.x + nodeWidth * distanceFactor * trigger.length,
|
||||||
|
} : {
|
||||||
x: padding.x + nodeWidth * 0.4,
|
x: padding.x + nodeWidth * 0.4,
|
||||||
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
|
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -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> = (
|
||||||
|
|||||||
@@ -27,19 +27,23 @@ export const makeSequenceUpdater = (
|
|||||||
choose: [],
|
choose: [],
|
||||||
default: [],
|
default: [],
|
||||||
},
|
},
|
||||||
update: n => onChange([
|
update: n => {
|
||||||
...sequence,
|
onChange([
|
||||||
n,
|
...sequence,
|
||||||
]),
|
n,
|
||||||
|
])
|
||||||
|
},
|
||||||
allowedTypes: ['action', 'condition']
|
allowedTypes: ['action', 'condition']
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
updateNode(i: number, node: AutomationSequenceNode) {
|
updateNode(i: number, node: AutomationSequenceNode) {
|
||||||
return onChange([
|
if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
|
||||||
...sequence.slice(0, i),
|
return onChange([
|
||||||
node,
|
...sequence.slice(0, i),
|
||||||
...sequence.slice(i + 1),
|
node,
|
||||||
])
|
...sequence.slice(i + 1),
|
||||||
|
])
|
||||||
|
}
|
||||||
},
|
},
|
||||||
updateChooseActionData(i: number, data: ChooseAction) {
|
updateChooseActionData(i: number, data: ChooseAction) {
|
||||||
const node = sequence[i] as ChooseAction;
|
const node = sequence[i] as ChooseAction;
|
||||||
|
|||||||
@@ -1,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
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { createAppUseStyles } from 'styles/theme';
|
|||||||
export interface ButtonIconStyleProps {
|
export interface ButtonIconStyleProps {
|
||||||
}
|
}
|
||||||
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
|
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
|
||||||
children: FC<IconBaseProps>;
|
Icon: FC<IconBaseProps>;
|
||||||
}
|
}
|
||||||
const useButtonIconStyles = createAppUseStyles(theme => ({
|
const useButtonIconStyles = createAppUseStyles(theme => ({
|
||||||
buttonIcon: {
|
buttonIcon: {
|
||||||
@@ -22,9 +22,9 @@ const useButtonIconStyles = createAppUseStyles(theme => ({
|
|||||||
|
|
||||||
|
|
||||||
export const ButtonIcon: FC<ButtonIconProps> = ({
|
export const ButtonIcon: FC<ButtonIconProps> = ({
|
||||||
children: Child,
|
Icon,
|
||||||
className,
|
className,
|
||||||
...props
|
...props
|
||||||
}) => <Child
|
}) => <Icon
|
||||||
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
|
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
|
||||||
/>
|
/>
|
||||||
@@ -32,7 +32,7 @@ IconList.args = {
|
|||||||
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
||||||
|
|
||||||
return <Page>
|
return <Page>
|
||||||
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon>
|
<ButtonIcon {...args} Icon={ArrowIcon} />
|
||||||
</Page>
|
</Page>
|
||||||
}
|
}
|
||||||
ButtonIconExample.args = {
|
ButtonIconExample.args = {
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
.input-autocomplete .BaseBadge-root {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--chip>span {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 0.15em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--chip>span>small::before {
|
||||||
|
content: "/ ";
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--chip>span>small {
|
||||||
|
size: 0.15em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--errors {
|
||||||
|
margin-top: 0.75em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--errors ul {
|
||||||
|
padding: 0 0 0 1em;
|
||||||
|
margin: 0;
|
||||||
|
max-height: 2.5em;
|
||||||
|
overflow-y: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-autocomplete--tags {
|
||||||
|
max-height: 5em;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
@@ -0,0 +1,204 @@
|
|||||||
|
import "./InputAutoComplete.css";
|
||||||
|
import { Option } from "haService";
|
||||||
|
import Autocomplete from "@mui/material/Autocomplete";
|
||||||
|
import TextField from "@mui/material/TextField";
|
||||||
|
import Chip from "@mui/material/Chip";
|
||||||
|
import { Badge } from "@mui/material";
|
||||||
|
import { SearchItem } from "./extras";
|
||||||
|
|
||||||
|
export type InputAutoCompleteProps<T extends Option<any>> = {
|
||||||
|
className?: string;
|
||||||
|
validateOption?: (v: string[]) => string[] | null;
|
||||||
|
groupBy?: (opt: T) => string;
|
||||||
|
options: T[];
|
||||||
|
getLabel?: (opt: T) => string;
|
||||||
|
getID?: (opt: T) => string;
|
||||||
|
helperText?: string;
|
||||||
|
} & InputAutoCompletePropsBase;
|
||||||
|
|
||||||
|
export type InputAutoCompletePropsBase = {
|
||||||
|
label?: string;
|
||||||
|
} & (
|
||||||
|
| {
|
||||||
|
value: string | null;
|
||||||
|
multiple?: false;
|
||||||
|
onChange: (v: string | null) => void;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
value: string | string[];
|
||||||
|
multiple: true;
|
||||||
|
onChange: (v: string[]) => void;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
export 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.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}
|
||||||
|
filterOptions={(opts, s) => {
|
||||||
|
const searchTerm = s.inputValue.toLocaleLowerCase().trim();
|
||||||
|
if (!searchTerm) {
|
||||||
|
return opts;
|
||||||
|
}
|
||||||
|
return opts
|
||||||
|
.map((opt) => {
|
||||||
|
let similarityScore = 0;
|
||||||
|
const eid = getID(opt);
|
||||||
|
if (eid.toLocaleLowerCase().includes(searchTerm)) {
|
||||||
|
similarityScore = Math.abs(eid.length - searchTerm.length);
|
||||||
|
}
|
||||||
|
const name = getLabel(opt);
|
||||||
|
if (name.toLocaleLowerCase().includes(searchTerm)) {
|
||||||
|
similarityScore = Math.abs(eid.length - searchTerm.length);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
label: name,
|
||||||
|
id: eid,
|
||||||
|
domain: typeof opt === "string" ? "" : (opt as any).domain,
|
||||||
|
similarityScore,
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.filter((opt) => opt.similarityScore > 0)
|
||||||
|
.sort((a, b) => {
|
||||||
|
return a.similarityScore > b.similarityScore ? 1 : -1;
|
||||||
|
}) as any;
|
||||||
|
}}
|
||||||
|
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}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
renderInput={(params) => (
|
||||||
|
<TextField
|
||||||
|
{...params}
|
||||||
|
variant="filled"
|
||||||
|
label={props.label ?? "Entity ID"}
|
||||||
|
helperText={helperText}
|
||||||
|
error={error}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
renderTags={(tagValue, getTagProps) => {
|
||||||
|
const inner = (
|
||||||
|
<div className="input-autocomplete--tags">
|
||||||
|
{tagValue.map((option, index) => {
|
||||||
|
const label = getLabel(option);
|
||||||
|
const id = getID(option);
|
||||||
|
const tagProps = getTagProps({ index });
|
||||||
|
tagProps.className += " input-autocomplete--chip";
|
||||||
|
return (
|
||||||
|
<Chip
|
||||||
|
size="medium"
|
||||||
|
label={
|
||||||
|
<>
|
||||||
|
{id === label ? <span>{label}</span> : <b>{label}</b>}
|
||||||
|
{id !== label && <small>{id}</small>}
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
{...tagProps}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
if (props.multiple) {
|
||||||
|
return (
|
||||||
|
<Badge badgeContent={tagValue.length} color="info">
|
||||||
|
{inner}
|
||||||
|
</Badge>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return inner;
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -7,14 +7,16 @@ export interface Props {
|
|||||||
value: boolean;
|
value: boolean;
|
||||||
onChange: (v: boolean) => void;
|
onChange: (v: boolean) => void;
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
|
className?: string;
|
||||||
}
|
}
|
||||||
export default function InputBoolean({
|
export default function InputBoolean({
|
||||||
label,
|
label,
|
||||||
value = false,
|
value = false,
|
||||||
onChange,
|
onChange,
|
||||||
disabled = false,
|
disabled = false,
|
||||||
|
className,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
return <FormGroup>
|
return <FormGroup className={className}>
|
||||||
<FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} />
|
<FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} />
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
import "./InputTime.css";
|
||||||
|
import { useState, useEffect, FC } from "react";
|
||||||
|
import TextField from '@mui/material/TextField';
|
||||||
|
import EditIcon from '@mui/icons-material/Edit';
|
||||||
|
import CloseIcon from "@mui/icons-material/Close";
|
||||||
|
import IconButton from "@mui/material/IconButton"
|
||||||
|
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
|
||||||
|
import { convertAutomationTimeToTimeObject, convertObjectToAutomationTimeString, milisecondsToObject } from "utils/time";
|
||||||
|
import { convertStringToAutomationTimeObject, convertAutomationTimeToTimeString } from 'utils/time';
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
import FormControl from "@mui/material/FormControl";
|
||||||
|
import InputLabel from '@mui/material/InputLabel';
|
||||||
|
import Input from "@mui/material/Input";
|
||||||
|
import FormHelperText from '@mui/material/FormHelperText';
|
||||||
|
|
||||||
|
// constants
|
||||||
|
const fields: Array<keyof AutomationTimeObject> = [
|
||||||
|
'hours',
|
||||||
|
'minutes',
|
||||||
|
'seconds',
|
||||||
|
'milliseconds'
|
||||||
|
]
|
||||||
|
export interface Props {
|
||||||
|
label: string;
|
||||||
|
value?: AutomationTime;
|
||||||
|
onChange: (v?: AutomationTimeObject) => void;
|
||||||
|
}
|
||||||
|
export const InputTime: FC<Props> = (props) => {
|
||||||
|
|
||||||
|
|
||||||
|
// state
|
||||||
|
const [disabled, setDisabled] = useState(!props.value)
|
||||||
|
const [displayValue, setDisplayValue] = useState(convertAutomationTimeToTimeObject(props.value))
|
||||||
|
|
||||||
|
// process display input
|
||||||
|
const updateOne = (k: keyof AutomationTimeObject) => (v: string) => {
|
||||||
|
if (Number(v) < 0) {
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
[k]: 0
|
||||||
|
})
|
||||||
|
} else if (k === "hours") {
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
[k]: Number(v)
|
||||||
|
})
|
||||||
|
} else if (k === "minutes") {
|
||||||
|
let minutes = Number(v);
|
||||||
|
let { hours = 0 } = displayValue
|
||||||
|
if (minutes > 59) {
|
||||||
|
const additonalHours = Math.floor(minutes / 60)
|
||||||
|
hours += additonalHours
|
||||||
|
minutes = minutes - additonalHours * 60
|
||||||
|
}
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
minutes,
|
||||||
|
hours,
|
||||||
|
})
|
||||||
|
} else if (k === "seconds") {
|
||||||
|
let seconds = Number(v);
|
||||||
|
let { hours = 0, minutes = 0 } = displayValue
|
||||||
|
if (seconds > 59) {
|
||||||
|
const additonalHours = Math.floor(seconds / (60 * 60))
|
||||||
|
hours += additonalHours
|
||||||
|
seconds = seconds - additonalHours * 60
|
||||||
|
}
|
||||||
|
if (seconds > 59) {
|
||||||
|
const additionalMinutes = Math.floor(seconds / 60)
|
||||||
|
minutes += additionalMinutes
|
||||||
|
seconds = seconds - additionalMinutes * 60
|
||||||
|
}
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
minutes,
|
||||||
|
hours,
|
||||||
|
seconds,
|
||||||
|
})
|
||||||
|
} else if (k === "milliseconds") {
|
||||||
|
let milliseconds = Number(v);
|
||||||
|
let { hours = 0, minutes = 0, seconds = 0 } = displayValue
|
||||||
|
if (milliseconds > 1000) {
|
||||||
|
const additonalHours = Math.floor(milliseconds / (60 * 60 * 1000))
|
||||||
|
hours += additonalHours
|
||||||
|
milliseconds = milliseconds - additonalHours * 60 * 60 * 1000
|
||||||
|
}
|
||||||
|
if (milliseconds > 1000) {
|
||||||
|
const additionalMinutes = Math.floor(milliseconds / (60 * 1000))
|
||||||
|
minutes += additionalMinutes
|
||||||
|
milliseconds = milliseconds - additionalMinutes * 60 * 1000
|
||||||
|
}
|
||||||
|
if (milliseconds > 1000) {
|
||||||
|
const additionalSeconds = Math.floor(milliseconds / 1000)
|
||||||
|
seconds += additionalSeconds
|
||||||
|
milliseconds = milliseconds - additionalSeconds * 1000
|
||||||
|
}
|
||||||
|
setDisplayValue({
|
||||||
|
...displayValue,
|
||||||
|
minutes,
|
||||||
|
hours,
|
||||||
|
seconds,
|
||||||
|
milliseconds,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// effect
|
||||||
|
useEffect(() => {
|
||||||
|
if (disabled && !props.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (disabled) {
|
||||||
|
props.onChange(undefined)
|
||||||
|
} else {
|
||||||
|
const pVal = convertAutomationTimeToTimeString(props.value);
|
||||||
|
const cVal = convertObjectToAutomationTimeString(displayValue);
|
||||||
|
if (pVal !== cVal) {
|
||||||
|
props.onChange(displayValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [disabled, displayValue])
|
||||||
|
|
||||||
|
|
||||||
|
return <div className="input-time">
|
||||||
|
<InputLabel >{props.label}</InputLabel>
|
||||||
|
<div className="input-time--inner">
|
||||||
|
{fields.map(name =>
|
||||||
|
<TextField
|
||||||
|
key={name}
|
||||||
|
variant="filled"
|
||||||
|
label={prettyName(name)}
|
||||||
|
defaultValue="00"
|
||||||
|
InputProps={{
|
||||||
|
disabled,
|
||||||
|
type: "number",
|
||||||
|
title: prettyName(name),
|
||||||
|
}}
|
||||||
|
value={displayValue[name] ?? 0}
|
||||||
|
onChange={e => updateOne(name)(e.target.value)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<IconButton onClick={() => setDisabled(!disabled)}>
|
||||||
|
{disabled ? <EditIcon /> : <CloseIcon />}
|
||||||
|
</IconButton>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { InputDevice } from "./InputDevice";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Inputs/InputDevice',
|
||||||
|
component: InputDevice,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
argTypes: {}
|
||||||
|
} as ComponentMeta<typeof InputDevice>;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof InputDevice> = args => {
|
||||||
|
const [value, setValue] = useState(args.value)
|
||||||
|
return <Page>
|
||||||
|
<div style={{
|
||||||
|
maxWidth: 200
|
||||||
|
}}>
|
||||||
|
<InputDevice {...args} value={value as any} onChange={(v: any) => {
|
||||||
|
setValue(v)
|
||||||
|
args.onChange(v as any)
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
</Page>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Single = Template.bind({})
|
||||||
|
Single.args = {
|
||||||
|
...Single.args,
|
||||||
|
multiple: false,
|
||||||
|
value: 'sensor.humidity_bathroom'
|
||||||
|
} as any
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import { FC } from "react";
|
||||||
|
import { useHADeviceRegistry } from 'haService';
|
||||||
|
import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
|
||||||
|
|
||||||
|
export type InputDeviceProps = InputAutoCompletePropsBase & { multiple?: false };
|
||||||
|
|
||||||
|
export const InputDevice: FC<InputDeviceProps> = props => {
|
||||||
|
// state
|
||||||
|
const dr = useHADeviceRegistry();
|
||||||
|
|
||||||
|
return <InputAutoComplete
|
||||||
|
{...props}
|
||||||
|
label={props.label ?? "Device ID"}
|
||||||
|
getID={dr.getID}
|
||||||
|
getLabel={dr.getLabel}
|
||||||
|
options={dr.getOptions()}
|
||||||
|
/>
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { FC } from "react";
|
||||||
|
import { useHAEntities } from 'haService';
|
||||||
|
import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
|
||||||
|
export type InputEntityProps = InputAutoCompletePropsBase & {
|
||||||
|
restrictToDomain?: string[],
|
||||||
|
}
|
||||||
|
|
||||||
|
export const InputEntity: FC<InputEntityProps> = props => {
|
||||||
|
// state
|
||||||
|
const entities = useHAEntities();
|
||||||
|
return <InputAutoComplete
|
||||||
|
{...props}
|
||||||
|
validateOption={v => entities.validateOptions(v, props.restrictToDomain)}
|
||||||
|
options={entities.getOptions(props.restrictToDomain)}
|
||||||
|
getID={entities.getID}
|
||||||
|
getLabel={entities.getLabel}
|
||||||
|
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { InputEntity } from "./InputEntities";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Inputs/InputEntity',
|
||||||
|
component: InputEntity,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
argTypes: {}
|
||||||
|
} as ComponentMeta<typeof InputEntity>;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof InputEntity> = args => {
|
||||||
|
const [value, setValue] = useState(args.value)
|
||||||
|
return <Page>
|
||||||
|
<div style={{
|
||||||
|
maxWidth: 200
|
||||||
|
}}>
|
||||||
|
<InputEntity {...args} value={value as any} onChange={(v: any) => {
|
||||||
|
setValue(v)
|
||||||
|
args.onChange(v as any)
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
</Page>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Single = Template.bind({})
|
||||||
|
Single.args = {
|
||||||
|
...Single.args,
|
||||||
|
multiple: false,
|
||||||
|
value: 'sensor.bathroom'
|
||||||
|
} as any
|
||||||
|
|
||||||
|
export const Many = Template.bind({})
|
||||||
|
Many.args = {
|
||||||
|
...Many.args,
|
||||||
|
multiple: true,
|
||||||
|
value: ['sensor.bathroom', 'person.ari']
|
||||||
|
} as any
|
||||||
|
|
||||||
|
export const ManyEmpty = Template.bind({})
|
||||||
|
ManyEmpty.args = {
|
||||||
|
...ManyEmpty.args,
|
||||||
|
multiple: true,
|
||||||
|
value: []
|
||||||
|
} as any
|
||||||
|
|
||||||
|
|
||||||
|
export const ManyButGotSingle = Template.bind({})
|
||||||
|
ManyButGotSingle.args = {
|
||||||
|
...ManyButGotSingle.args,
|
||||||
|
multiple: true,
|
||||||
|
value: 'sensor.bathroom'
|
||||||
|
} as any
|
||||||
|
|
||||||
|
|
||||||
|
export const InvalidDomain = Template.bind({})
|
||||||
|
InvalidDomain.args = {
|
||||||
|
...InvalidDomain.args,
|
||||||
|
multiple: true,
|
||||||
|
value: 'sensor.bathroom',
|
||||||
|
restrictToDomain: ['zone'],
|
||||||
|
} as any
|
||||||
|
|
||||||
|
|
||||||
|
export const InvalidManyDomain = Template.bind({})
|
||||||
|
InvalidManyDomain.args = {
|
||||||
|
...InvalidManyDomain.args,
|
||||||
|
multiple: true,
|
||||||
|
value: 'sensor.bathroom',
|
||||||
|
restrictToDomain: ['zone', 'switch'],
|
||||||
|
} as any
|
||||||
|
|
||||||
|
export const InvalidLots = Template.bind({})
|
||||||
|
InvalidLots.args = {
|
||||||
|
...InvalidLots.args,
|
||||||
|
multiple: true,
|
||||||
|
value: ['person.ari', 'sensor.bathroom', 'binary_sensor.ping_tv', 'device_tracker.phone'],
|
||||||
|
restrictToDomain: ['zone', 'switch'],
|
||||||
|
} as any
|
||||||
@@ -1,74 +1,74 @@
|
|||||||
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;
|
||||||
|
};
|
||||||
|
export function InputList<T extends string | Object>({
|
||||||
current,
|
current,
|
||||||
options,
|
options,
|
||||||
onChange,
|
onChange,
|
||||||
label,
|
label,
|
||||||
id,
|
id,
|
||||||
className,
|
className,
|
||||||
}) => {
|
prettyOptionLabels,
|
||||||
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,
|
||||||
|
}: 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}
|
|
||||||
|
|
||||||
>
|
>
|
||||||
{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();
|
>
|
||||||
// if (e.currentTarget.id === 'invalid') {
|
{options.map((t, i) => (
|
||||||
// onChange(options[0])
|
<MenuItem key={i} value={getKey(t)}>
|
||||||
// } else {
|
{prettyOptionLabels ? prettyName(getKey(t)) : getKey(t)}
|
||||||
// onChange(e.currentTarget.value as any);
|
</MenuItem>
|
||||||
// }
|
))}
|
||||||
// }}
|
</Select>
|
||||||
// >
|
<FormHelperText variant="filled" error={invalidCurrent}>
|
||||||
// {options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
|
{invalidCurrent ? `'${current}' is not a valid selection` : helperText}
|
||||||
// {invalidCurrent ? <option
|
</FormHelperText>
|
||||||
// id={'invalid'}
|
</FormControl>
|
||||||
// value={current}
|
);
|
||||||
// style={{ display: 'none' }}
|
|
||||||
// >!{current}!</option> : <></>}
|
|
||||||
// </select>
|
|
||||||
// </InputWrapper>
|
|
||||||
}
|
}
|
||||||
@@ -1,43 +1,61 @@
|
|||||||
import InputWrapper from "./InputWrapper";
|
import Close from "@mui/icons-material/Close";
|
||||||
import { useInputNumberStyles } from "./styles";
|
import TextField from "@mui/material/TextField";
|
||||||
|
import IconButton from "@mui/material/IconButton";
|
||||||
|
import InputAdornment from "@mui/material/InputAdornment";
|
||||||
|
import Edit from "@mui/icons-material/Edit";
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
label: string;
|
label: string | 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;
|
||||||
}
|
}
|
||||||
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,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const { classes } = useInputNumberStyles({});
|
const disabled = value === undefined || value === null;
|
||||||
return <InputWrapper className={className} label={label} labelSize={value !== undefined ? 'small' : 'normal'}>
|
return (
|
||||||
<input
|
<TextField
|
||||||
className={classes.input}
|
variant="filled"
|
||||||
type="number"
|
label={label}
|
||||||
value={value ?? ""}
|
value={value}
|
||||||
onChange={e => {
|
defaultValue={value}
|
||||||
e.preventDefault();
|
onChange={(e) => onChange(Number(e.target.value ?? 0))}
|
||||||
let v = Number(e.target.value);
|
disabled={disabled}
|
||||||
if (max) {
|
className={className}
|
||||||
v = Math.min(v, max)
|
placeholder={placeholder}
|
||||||
}
|
required={required}
|
||||||
if (min) {
|
InputProps={{
|
||||||
v = Math.max(v, min)
|
endAdornment: (
|
||||||
}
|
<InputAdornment position="end">
|
||||||
onChange(v)
|
{unit}
|
||||||
|
<IconButton onClick={() => onChange(disabled ? 0 : undefined)}>
|
||||||
|
{disabled ? <Edit /> : <Close />}
|
||||||
|
</IconButton>
|
||||||
|
</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,60 +1,89 @@
|
|||||||
import { PropsWithChildren, useState } from "react";
|
import React, { PropsWithChildren, 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";
|
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?: string;
|
||||||
|
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,
|
children,
|
||||||
|
className,
|
||||||
|
placeholder,
|
||||||
|
required,
|
||||||
}: PropsWithChildren<Props>) {
|
}: PropsWithChildren<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}
|
<InputWrapper className={className} label="">
|
||||||
onKeyDown={e => {
|
<TextField
|
||||||
if (e.key === 'Enter') {
|
multiline={multiline}
|
||||||
onEnter();
|
maxRows={maxRows}
|
||||||
}
|
fullWidth
|
||||||
}}
|
inputMode="text"
|
||||||
onChange={e => {
|
variant="filled"
|
||||||
e.preventDefault();
|
focused={isFocused}
|
||||||
onChange(e.target.value)
|
label={label}
|
||||||
}}
|
value={value}
|
||||||
onBlur={() => {
|
title={title}
|
||||||
setIsFocused(false)
|
helperText={helperText}
|
||||||
}}
|
placeholder={placeholder}
|
||||||
onFocus={e => {
|
InputProps={{
|
||||||
setIsFocused(true)
|
endAdornment,
|
||||||
if (textBoxFor) {
|
}}
|
||||||
tooltip.setFocus(
|
required={required}
|
||||||
e.target.getBoundingClientRect(),
|
onKeyDown={(e) => {
|
||||||
{
|
if (e.key === "Enter") {
|
||||||
searchObject: textBoxFor,
|
onEnter();
|
||||||
searchText: value,
|
}
|
||||||
filterObjects: additionalTooltipFilters,
|
}}
|
||||||
},
|
onChange={(e) => {
|
||||||
onChange
|
e.preventDefault();
|
||||||
)
|
onChange(e.target.value);
|
||||||
}
|
}}
|
||||||
}}
|
onBlur={() => {
|
||||||
/>
|
setIsFocused(false);
|
||||||
{children}
|
}}
|
||||||
</InputWrapper>
|
onFocus={(e) => {
|
||||||
|
setIsFocused(true);
|
||||||
|
if (textBoxFor) {
|
||||||
|
tooltip.setFocus(
|
||||||
|
e.target.getBoundingClientRect(),
|
||||||
|
{
|
||||||
|
searchObject: textBoxFor,
|
||||||
|
searchText: value,
|
||||||
|
filterObjects: additionalTooltipFilters,
|
||||||
|
},
|
||||||
|
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,9 @@
|
|||||||
|
.input-time>.input-time--inner {
|
||||||
|
display: flex;
|
||||||
|
gap: 0;
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
|
||||||
|
.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,145 @@
|
|||||||
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 IconButton from "@mui/material/IconButton"
|
||||||
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
|
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
|
||||||
import { milisecondsToObject } from "utils/time";
|
import { convertAutomationTimeToTimeObject, convertObjectToAutomationTimeString, convertAutomationTimeToTimeString } from 'utils/time';
|
||||||
import InputWrapper from "./InputWrapper";
|
import { prettyName } from "utils/formatting";
|
||||||
import { useInputTimeStyles } from "./styles";
|
|
||||||
import { convertStringToAutomationTimeObject } from 'utils/time';
|
|
||||||
|
|
||||||
|
// 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,
|
|
||||||
textBoxFor,
|
|
||||||
value = {},
|
// state
|
||||||
onChange,
|
const [disabled, setDisabled] = useState(!props.value)
|
||||||
onEnter = () => { },
|
const [displayValue, setDisplayValue] = useState(convertAutomationTimeToTimeObject(props.value))
|
||||||
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,
|
|
||||||
seconds = 0,
|
|
||||||
milliseconds = 0,
|
|
||||||
} = value;
|
|
||||||
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
|
|
||||||
}
|
}
|
||||||
const { classes } = useInputTimeStyles({});
|
|
||||||
const [isFocused, setIsFocused] = useState(false)
|
|
||||||
return <InputWrapper className={classes.wrapper} label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
|
// effect
|
||||||
<input
|
useEffect(() => {
|
||||||
className={classes.input}
|
if (disabled && !props.value) {
|
||||||
type="time"
|
return
|
||||||
step={0.001}
|
}
|
||||||
value={cleanValue}
|
if (disabled) {
|
||||||
onKeyDown={e => {
|
props.onChange(undefined)
|
||||||
if (e.key === 'Enter') {
|
} else {
|
||||||
onEnter();
|
const pVal = convertAutomationTimeToTimeString(props.value);
|
||||||
}
|
const cVal = convertObjectToAutomationTimeString(displayValue);
|
||||||
}}
|
if (pVal !== cVal) {
|
||||||
onChange={e => {
|
props.onChange(displayValue)
|
||||||
e.preventDefault();
|
}
|
||||||
onChange(milisecondsToObject(e.target.valueAsNumber))
|
}
|
||||||
}}
|
// eslint-disable-next-line
|
||||||
onBlur={e => {
|
}, [disabled, displayValue])
|
||||||
setIsFocused(false)
|
|
||||||
}}
|
|
||||||
/>
|
return <div className={["input-time", props.className ?? ""].join(" ")}>
|
||||||
<button onClick={() => onChange()} className={classes.cancel}>X</button>
|
{/* <InputLabel >{props.label}</InputLabel> */}
|
||||||
{children}
|
<div className="input-time--inner">
|
||||||
</InputWrapper>
|
{fields.map(name =>
|
||||||
|
<TextField
|
||||||
|
key={name}
|
||||||
|
variant="filled"
|
||||||
|
label={prettyName(name)}
|
||||||
|
defaultValue="00"
|
||||||
|
InputProps={{
|
||||||
|
disabled,
|
||||||
|
type: "number",
|
||||||
|
title: prettyName(name),
|
||||||
|
}}
|
||||||
|
value={displayValue[name] ?? 0}
|
||||||
|
onChange={e => updateOne(name)(e.target.value)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<IconButton onClick={() => setDisabled(!disabled)}>
|
||||||
|
{disabled ? <EditIcon /> : <CloseIcon />}
|
||||||
|
</IconButton>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
@@ -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 })
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as yaml from "js-yaml";
|
import * as yaml from "js-yaml";
|
||||||
import { useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { useDelayEffect } from 'utils/useDelay';
|
import { useDelayEffect } from 'utils/useDelay';
|
||||||
|
|
||||||
import CodeMirror from '@uiw/react-codemirror';
|
import CodeMirror from '@uiw/react-codemirror';
|
||||||
@@ -10,18 +10,22 @@ 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;
|
||||||
}
|
}
|
||||||
export default function InputYaml<T>({
|
export default function InputYaml<T extends {}>({
|
||||||
label,
|
label,
|
||||||
|
error: incmError,
|
||||||
value = {} as any,
|
value = {} as any,
|
||||||
onChange,
|
onChange,
|
||||||
|
className,
|
||||||
}: Props<T>) {
|
}: Props<T>) {
|
||||||
const [{ text, error }, setState] = useState<{
|
const [{ text, error }, setState] = useState<{
|
||||||
text: string,
|
text: string,
|
||||||
error: undefined | string,
|
error: undefined | JSX.Element | string,
|
||||||
}>({
|
}>({
|
||||||
text: yaml.dump(value),
|
text: yaml.dump(value),
|
||||||
error: undefined
|
error: incmError,
|
||||||
});
|
});
|
||||||
const setText = (t: string) => {
|
const setText = (t: string) => {
|
||||||
try {
|
try {
|
||||||
@@ -31,6 +35,12 @@ export default function InputYaml<T>({
|
|||||||
setState({ text: t, error: "! Invalid Yaml !" })
|
setState({ text: t, error: "! Invalid Yaml !" })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
useEffect(() => {
|
||||||
|
setState({
|
||||||
|
text: yaml.dump(value),
|
||||||
|
error: incmError,
|
||||||
|
})
|
||||||
|
}, [value, incmError])
|
||||||
useDelayEffect(() => {
|
useDelayEffect(() => {
|
||||||
if (!error && (yaml.dump(value) !== text)) {
|
if (!error && (yaml.dump(value) !== text)) {
|
||||||
if (text) {
|
if (text) {
|
||||||
@@ -42,7 +52,7 @@ export default function InputYaml<T>({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [text], 1000)
|
}, [text], 1000)
|
||||||
return <InputWrapper label={label} error={error}>
|
return <InputWrapper className={className} label={label} error={error}>
|
||||||
<CodeMirror
|
<CodeMirror
|
||||||
theme={"dark"}
|
theme={"dark"}
|
||||||
value={text}
|
value={text}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
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>
|
||||||
|
<SearchItem {...args} />
|
||||||
|
</Page>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Simple = Template.bind({})
|
||||||
|
Simple.args = {
|
||||||
|
id: "sensor.humidity_main_bedroom",
|
||||||
|
label: 'Main Bedroom Humidity',
|
||||||
|
searchTerm: "bedroom",
|
||||||
|
listProps: {},
|
||||||
|
} as any
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
.input-extras--search-item--list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 0.15em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-extras--search-item--list>small::before {
|
||||||
|
content: "/ ";
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
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,
|
||||||
|
}> = ({
|
||||||
|
listProps,
|
||||||
|
label,
|
||||||
|
id,
|
||||||
|
searchTerm
|
||||||
|
}) => <li {...listProps} className={[listProps.className ?? "", 'input-extras--search-item--list'].join(' ')}>
|
||||||
|
<b><HighlightElm text={label} searchTerm={searchTerm} /></b> <small>
|
||||||
|
<HighlightElm text={id} searchTerm={searchTerm} />
|
||||||
|
</small>
|
||||||
|
</li>
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
import { FC } from "react";
|
import { FC, ReactNode } from "react";
|
||||||
import { createAppUseStyles } from "styles/theme";
|
import { createAppUseStyles } from "styles/theme";
|
||||||
|
|
||||||
export interface ModalStyleProps {
|
export interface ModalStyleProps {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
}
|
}
|
||||||
export interface Props extends ModalStyleProps {
|
export interface Props extends ModalStyleProps {
|
||||||
|
children: ReactNode;
|
||||||
}
|
}
|
||||||
const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
|
const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
|
||||||
root: ({ open }) => ({
|
root: ({ open }) => ({
|
||||||
@@ -12,7 +13,7 @@ const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
|
|||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
zIndex: open ? 10 : -1,
|
zIndex: open ? 10 : -1,
|
||||||
position: 'absolute',
|
position: 'fixed',
|
||||||
height: '100vh',
|
height: '100vh',
|
||||||
width: '100vw',
|
width: '100vw',
|
||||||
top: 0,
|
top: 0,
|
||||||
@@ -29,10 +30,10 @@ const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
|
|||||||
},
|
},
|
||||||
inner: {
|
inner: {
|
||||||
zIndex: 10,
|
zIndex: 10,
|
||||||
maxWidth: '80%',
|
maxWidth: '80vw',
|
||||||
maxHeight: '90%',
|
maxHeight: '90vh',
|
||||||
minHeight: 'fit-content',
|
minHeight: 'min-content',
|
||||||
minWidth: 'fit-content',
|
minWidth: '100px',
|
||||||
padding: '15px',
|
padding: '15px',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
|
|||||||
@@ -34,3 +34,15 @@
|
|||||||
.multinode-editor.modded .multinode-editor--total {
|
.multinode-editor.modded .multinode-editor--total {
|
||||||
color: var(--green-light)
|
color: var(--green-light)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.multinode-editor.modded .node-editor--footer--save {
|
||||||
|
border-color: var(--green-opaque);
|
||||||
|
background-color: var(--green-light);
|
||||||
|
color: var(--primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.multinode-editor.modded .node-editor--footer--save:hover {
|
||||||
|
border-color: var(--green-light);
|
||||||
|
background-color: var(--green-opaque);
|
||||||
|
color: var(--green-light);
|
||||||
|
}
|
||||||
@@ -19,19 +19,18 @@ export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
|
|||||||
</Button>;
|
</Button>;
|
||||||
// branch
|
// branch
|
||||||
if (state.isEmpty) {
|
if (state.isEmpty) {
|
||||||
return <div className='column center' style={{
|
return <div className={["multinode-editor", state.isModified ? "modded" : '', isMobile ? 'mobile' : ''].join(' ')} style={{
|
||||||
minWidth: '20vw',
|
minWidth: '20vw',
|
||||||
}}>
|
}}>
|
||||||
<div style={{
|
<div className="multinode-editor--navbar">
|
||||||
flex: 1,
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
alignItems: 'flex-start',
|
|
||||||
}}>
|
|
||||||
{nextOrAddBtn}
|
{nextOrAddBtn}
|
||||||
</div>
|
</div>
|
||||||
<div className='column center' style={{ marginTop: '1em' }}>
|
<div className='node-editor--footer' style={{ marginTop: '1em' }}>
|
||||||
<Button onClick={state.onClose}>Close</Button>
|
<Button onClick={state.onClose}>Close</Button>
|
||||||
|
<Button onClick={state.onSaveEmpty} className="node-editor--footer--save">Save</Button>
|
||||||
|
</div>
|
||||||
|
<div className='column center'>
|
||||||
|
<span>{state.currentSlideNumber}/<u className="multinode-editor--total">{state.totalSlides}</u></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,9 +107,9 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
|
|||||||
slides.slice(slide + 1)
|
slides.slice(slide + 1)
|
||||||
),
|
),
|
||||||
multiNode: {
|
multiNode: {
|
||||||
isModified: multiNode.isModified,
|
isModified: true,
|
||||||
isSaved: false,
|
isSaved: false,
|
||||||
}
|
},
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
onSave(node: AutomationNode) {
|
onSave(node: AutomationNode) {
|
||||||
@@ -129,6 +129,17 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
|
|||||||
internalNodeModified: false,
|
internalNodeModified: false,
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
onSaveEmpty() {
|
||||||
|
justSaved.current = true
|
||||||
|
setState({
|
||||||
|
...state,
|
||||||
|
multiNode: {
|
||||||
|
isModified: multiNode.isModified,
|
||||||
|
isSaved: true,
|
||||||
|
},
|
||||||
|
internalNodeModified: false,
|
||||||
|
})
|
||||||
|
},
|
||||||
onClose() {
|
onClose() {
|
||||||
if (!multiNode.isSaved && multiNode.isModified) {
|
if (!multiNode.isSaved && multiNode.isModified) {
|
||||||
if (!window.confirm("You haven't saved your work, are you ok with losing it?")) {
|
if (!window.confirm("You haven't saved your work, are you ok with losing it?")) {
|
||||||
@@ -136,6 +147,9 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
|
|||||||
}
|
}
|
||||||
props.onSave && props.onSave(slides)
|
props.onSave && props.onSave(slides)
|
||||||
}
|
}
|
||||||
|
if (justSaved.current) {
|
||||||
|
props.onSave && props.onSave(slides)
|
||||||
|
}
|
||||||
props.onClose && props.onClose()
|
props.onClose && props.onClose()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { InputDevice } from "components/Inputs/InputDevice";
|
||||||
|
import { InputEntity } from "components/Inputs/InputEntities";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { DeviceAction } from "types/automations/actions";
|
import { DeviceAction } from "types/automations/actions";
|
||||||
import { OptionManager, updateActionData } from './OptionManager';
|
import { OptionManager, updateActionData } from './OptionManager';
|
||||||
@@ -6,44 +8,28 @@ import { OptionManager, updateActionData } from './OptionManager';
|
|||||||
export const ActionDeviceState: OptionManager<DeviceAction> = {
|
export const ActionDeviceState: OptionManager<DeviceAction> = {
|
||||||
defaultState: () => ({
|
defaultState: () => ({
|
||||||
alias: "",
|
alias: "",
|
||||||
type: "",
|
device_id: ""
|
||||||
entity_id: "",
|
|
||||||
device_id: "",
|
|
||||||
domain: "",
|
|
||||||
}),
|
}),
|
||||||
isReady: ({
|
isReady: () => true,
|
||||||
alias,
|
renderOptionList: (state, setState, entities) => {
|
||||||
type,
|
|
||||||
entity_id,
|
|
||||||
device_id,
|
|
||||||
domain,
|
|
||||||
}) => (
|
|
||||||
alias !== '' &&
|
|
||||||
type !== "" &&
|
|
||||||
entity_id !== "" &&
|
|
||||||
device_id !== "" &&
|
|
||||||
domain !== ""
|
|
||||||
),
|
|
||||||
renderOptionList: (state, setState) => {
|
|
||||||
const update = updateActionData(state, setState);
|
const update = updateActionData(state, setState);
|
||||||
return <>
|
return <>
|
||||||
<InputText
|
<InputDevice
|
||||||
textBoxFor="device_id"
|
value={state.device_id ?? ""}
|
||||||
label="Device"
|
onChange={device_id => update({ device_id: device_id ?? "" })}
|
||||||
value={state.device_id}
|
|
||||||
onChange={device_id => update({ device_id })}
|
|
||||||
/>
|
/>
|
||||||
<InputText
|
<InputText
|
||||||
textBoxFor="type"
|
textBoxFor="type"
|
||||||
label="Action"
|
label="Action"
|
||||||
value={state.type}
|
value={state.type ?? ""}
|
||||||
onChange={type => update({ type })}
|
onChange={type => update({ type })}
|
||||||
/>
|
/>
|
||||||
<InputText
|
<InputEntity
|
||||||
textBoxFor="entity_id"
|
|
||||||
label="Entity ID"
|
|
||||||
value={state.entity_id ?? ""}
|
value={state.entity_id ?? ""}
|
||||||
onChange={entity_id => update({ entity_id, domain: entity_id.split('.')[0] })}
|
onChange={entity_id => update({
|
||||||
|
entity_id: entity_id ? entity_id : undefined,
|
||||||
|
domain: entity_id ? entity_id.split('.')[0] : ""
|
||||||
|
})}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import InputText from "components/Inputs/InputText";
|
import { InputService } from "components/Inputs/InputService";
|
||||||
import InputYaml from 'components/Inputs/InputYaml';
|
import { ServiceEditor } from "components/ServiceEditor";
|
||||||
import { ServiceAction } from "types/automations/actions";
|
import { ServiceAction } from "types/automations/actions";
|
||||||
import { OptionManager, updateActionData } from './OptionManager';
|
import { OptionManager, updateActionData } from "./OptionManager";
|
||||||
|
|
||||||
|
|
||||||
export const ActionCallServiceState: OptionManager<ServiceAction> = {
|
export const ActionCallServiceState: OptionManager<ServiceAction> = {
|
||||||
defaultState: () => ({
|
defaultState: () => ({
|
||||||
@@ -10,31 +9,34 @@ export const ActionCallServiceState: OptionManager<ServiceAction> = {
|
|||||||
target: {},
|
target: {},
|
||||||
data: {},
|
data: {},
|
||||||
}),
|
}),
|
||||||
isReady: ({
|
isReady: ({ service }) => service !== "",
|
||||||
service,
|
Component: ({ state, setState, services }) => {
|
||||||
}) => (
|
|
||||||
service !== ''
|
|
||||||
),
|
|
||||||
renderOptionList: (state, setState) => {
|
|
||||||
const { service, target, data } = state;
|
const { service, target, data } = state;
|
||||||
const update = updateActionData(state, setState);
|
const update = updateActionData(state, setState);
|
||||||
return <>
|
const serviceOption = services.getOption(service);
|
||||||
<InputText
|
return (
|
||||||
textBoxFor="service"
|
<>
|
||||||
label="Service"
|
<InputService
|
||||||
value={service}
|
value={service}
|
||||||
onChange={service => update({ service })}
|
onChange={(service: string | null) =>
|
||||||
/>
|
update({ service: service ?? "" })
|
||||||
<InputYaml
|
}
|
||||||
label="Target"
|
/>
|
||||||
value={target}
|
{serviceOption && (
|
||||||
onChange={target => update({ target })}
|
<ServiceEditor
|
||||||
/>
|
key={service}
|
||||||
<InputYaml
|
serviceId={service}
|
||||||
label="Data"
|
service={serviceOption}
|
||||||
value={data}
|
data={{ target, field: data }}
|
||||||
onChange={data => update({ data })}
|
onUpdate={({ target, field }) =>
|
||||||
/>
|
update({
|
||||||
</>
|
target,
|
||||||
}
|
data: field,
|
||||||
}
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
.node-editor--action-wait {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.node-editor--action-wait .for {
|
||||||
|
flex: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.node-editor--action-wait .for .input-time--inner {
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.node-editor--action-wait .template {
|
||||||
|
margin: 0;
|
||||||
|
flex: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.node-editor--action-wait .triggers {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.node-editor--action-wait .wait-type {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.node-editor--action-wait .wait-options {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-evenly;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
@@ -1,41 +1,109 @@
|
|||||||
|
import "./ActionWait.css";
|
||||||
import InputBoolean from "components/Inputs/InputBoolean";
|
import InputBoolean from "components/Inputs/InputBoolean";
|
||||||
|
import { InputList } from "components/Inputs/InputList";
|
||||||
|
import InputNumber from "components/Inputs/InputNumber";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { WaitAction } from "types/automations/actions";
|
import { InputTime } from "components/Inputs/InputTime";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { DelayAction, WaitAction } from "types/automations/actions";
|
||||||
import { OptionManager, updateActionData } from './OptionManager';
|
import { OptionManager, updateActionData } from './OptionManager';
|
||||||
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
|
||||||
|
type ThisAction = WaitAction | DelayAction;
|
||||||
|
type Option = 'delay' | 'template' | 'trigger'
|
||||||
|
const getCurrentOption = (node: ThisAction): Option => {
|
||||||
|
if ('delay' in node) {
|
||||||
|
return 'delay'
|
||||||
|
} else {
|
||||||
|
return 'template'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export const ActionWaitState: OptionManager<WaitAction> = {
|
export const ActionWaitState: OptionManager<ThisAction> = {
|
||||||
defaultState: () => ({
|
defaultState: () => ({
|
||||||
alias: "Wait",
|
delay: "",
|
||||||
wait_template: "",
|
|
||||||
// timeout: 0,
|
|
||||||
continue_on_timeout: false,
|
|
||||||
}),
|
}),
|
||||||
isReady: ({
|
isReady: () => true,
|
||||||
alias, wait_template
|
Component: ({ state, setState }) => {
|
||||||
}) => (
|
// state
|
||||||
alias !== '' &&
|
|
||||||
wait_template !== ""
|
|
||||||
),
|
|
||||||
renderOptionList: (state, setState) => {
|
|
||||||
const update = updateActionData(state, setState);
|
const update = updateActionData(state, setState);
|
||||||
return <>
|
const [current, _setCurrent] = useState(getCurrentOption(state));
|
||||||
<InputText
|
const setCurrent = (opt: Option) => {
|
||||||
textBoxFor="template"
|
const base: any = {
|
||||||
label="Template"
|
alias: state.alias,
|
||||||
value={state.wait_template}
|
variables: state.variables,
|
||||||
onChange={wait_template => update({ wait_template })}
|
}
|
||||||
/>
|
if (opt === 'delay') {
|
||||||
{/* <InputNumber
|
setState({
|
||||||
label="Timeout"
|
...base,
|
||||||
value={state.timeout ?? 0}
|
delay: (state as any).delay ?? "",
|
||||||
onChange={(timeout = 0) => update({ timeout })}
|
})
|
||||||
/> */}
|
} else {
|
||||||
<InputBoolean
|
base.timeout = (state as any).timeout
|
||||||
label="Continue on Timeout"
|
base.continue_on_timeout = (state as any).continue_on_timeout
|
||||||
value={state.continue_on_timeout ?? false}
|
if (opt === 'template') {
|
||||||
onChange={continue_on_timeout => update({ continue_on_timeout })}
|
setState({
|
||||||
/>
|
...base,
|
||||||
</>
|
wait_template: (state as any).wait_template ?? "",
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
setState({
|
||||||
|
...base,
|
||||||
|
wait_for_trigger: (state as any).wait_for_trigger ?? "",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_setCurrent(opt)
|
||||||
|
}
|
||||||
|
|
||||||
|
// determine options
|
||||||
|
let option: JSX.Element = <></>;
|
||||||
|
if (current === "delay") {
|
||||||
|
option = <>
|
||||||
|
<InputTime className="for" label="for" value={(state as any).delay} onChange={delay => update({ delay })} />
|
||||||
|
</>
|
||||||
|
} else if (current === 'template') {
|
||||||
|
state = state as WaitAction;
|
||||||
|
option = <>
|
||||||
|
<InputText
|
||||||
|
label="Template"
|
||||||
|
className="template"
|
||||||
|
value={state.wait_template ?? ""}
|
||||||
|
onChange={wait_template => update({ wait_template })}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
} else if (current === 'trigger') {
|
||||||
|
state = state as WaitAction;
|
||||||
|
option = <>
|
||||||
|
<InputYaml
|
||||||
|
className="triggers"
|
||||||
|
label="Triggers"
|
||||||
|
value={state.wait_for_trigger ?? []}
|
||||||
|
onChange={wait_for_trigger => update({ wait_for_trigger })}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
|
||||||
|
// render
|
||||||
|
return <div className="node-editor--action-wait">
|
||||||
|
<InputList
|
||||||
|
className="wait-type"
|
||||||
|
label="Wait Type" prettyOptionLabels
|
||||||
|
options={["template", 'trigger', "delay"]}
|
||||||
|
current={current} onChange={setCurrent} />
|
||||||
|
{option}
|
||||||
|
{current !== 'delay' ? <div className="wait-options">
|
||||||
|
<InputNumber
|
||||||
|
label="Timeout"
|
||||||
|
value={(state as any).timeout ? Number((state as any).timeout) : undefined}
|
||||||
|
onChange={timeout => update({ timeout: timeout === undefined ? undefined : String(timeout) })}
|
||||||
|
/>
|
||||||
|
<InputBoolean
|
||||||
|
label="Continue on Timeout"
|
||||||
|
value={(state as any).continue_on_timeout ?? false}
|
||||||
|
onChange={continue_on_timeout => update({ continue_on_timeout })}
|
||||||
|
/>
|
||||||
|
</div> : <></>}
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,28 +1,47 @@
|
|||||||
|
import { HAEntitiesState, HAServicesState } from 'haService';
|
||||||
|
import { FC } from 'react';
|
||||||
import { AutomationAction } from 'types/automations/actions';
|
import { AutomationAction } from 'types/automations/actions';
|
||||||
import { AutomationCondition } from 'types/automations/conditions';
|
import { AutomationCondition } from 'types/automations/conditions';
|
||||||
export interface OptionManager<T> {
|
export type OptionManager<T> = {
|
||||||
defaultState(): T;
|
defaultState(): T;
|
||||||
isReady(s: T): boolean;
|
isReady(s: T): boolean;
|
||||||
renderOptionList(s: T, set: (s: T) => void): JSX.Element;
|
} & ({
|
||||||
}
|
renderOptionList(s: T, set: (s: T) => void, entities: HAEntitiesState): JSX.Element;
|
||||||
|
} | {
|
||||||
|
Component: FC<{
|
||||||
|
state: T,
|
||||||
|
setState: (s: T) => void,
|
||||||
|
entities: HAEntitiesState,
|
||||||
|
services: HAServicesState,
|
||||||
|
}>
|
||||||
|
})
|
||||||
|
|
||||||
|
export const cleanUpUndefined = (data: Record<string, any>): any => {
|
||||||
|
const clean: any = {};
|
||||||
|
Object.keys(data).forEach(k => {
|
||||||
|
if ((data[k] !== undefined) && (data[k] !== null)) {
|
||||||
|
clean[k] = data[k]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return clean;
|
||||||
|
}
|
||||||
|
|
||||||
export const updateConditionData = <T extends AutomationCondition>(
|
export const updateConditionData = <T extends AutomationCondition>(
|
||||||
setState: (s: T) => void
|
setState: (s: T) => void
|
||||||
) => (
|
) => (
|
||||||
state: T,
|
state: T,
|
||||||
data: Partial<T>,
|
data: Partial<T>,
|
||||||
) => setState({
|
) => setState(cleanUpUndefined({
|
||||||
...state,
|
...state,
|
||||||
...data,
|
...data,
|
||||||
})
|
}))
|
||||||
|
|
||||||
export const updateActionData = <T extends AutomationAction>(
|
export const updateActionData = <T extends AutomationAction>(
|
||||||
state: T,
|
state: T,
|
||||||
setState: (s: T) => void
|
setState: (s: T) => void
|
||||||
) => (
|
) => (
|
||||||
data: Partial<T>,
|
data: Partial<T>,
|
||||||
) => setState({
|
) => setState(cleanUpUndefined({
|
||||||
...state,
|
...state,
|
||||||
...data,
|
...data,
|
||||||
})
|
}))
|
||||||
@@ -1,26 +1,21 @@
|
|||||||
import { OptionManager } from './OptionManager';
|
import { OptionManager } from './OptionManager';
|
||||||
import { AutomationTriggerDevice } from 'types/automations/triggers';
|
import { AutomationTriggerDevice } from 'types/automations/triggers';
|
||||||
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 InputTextBubble from 'components/Inputs/InputTextBubble';
|
||||||
|
import { InputDevice } from 'components/Inputs/InputDevice';
|
||||||
|
|
||||||
|
|
||||||
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||||
defaultState: () => ({
|
defaultState: () => ({
|
||||||
"platform": 'device',
|
"platform": 'device',
|
||||||
"domain": "",
|
|
||||||
"type": "",
|
|
||||||
"subtype": "",
|
|
||||||
"device_id": "",
|
|
||||||
"entity_id": "",
|
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
renderOptionList: (state, setState, { getDomainList }) => {
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
|
||||||
return <>
|
return <>
|
||||||
<InputText label="Domain" value={state.domain ?? ""} onChange={domain => setState({
|
<InputTextBubble label="Domain" options={getDomainList()} value={state.domain} onChange={domain => setState({
|
||||||
...state,
|
...state,
|
||||||
domain
|
domain: domain ? domain[0] : "",
|
||||||
})} />
|
})} />
|
||||||
<InputText label="Type" value={state.type ?? ""} onChange={type => setState({
|
<InputText label="Type" value={state.type ?? ""} onChange={type => setState({
|
||||||
...state,
|
...state,
|
||||||
@@ -30,11 +25,11 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
|||||||
...state,
|
...state,
|
||||||
subtype
|
subtype
|
||||||
})} />
|
})} />
|
||||||
<InputText label="Device" value={state.device_id ?? ""} onChange={device_id => setState({
|
<InputDevice value={state.device_id ?? ""} onChange={device_id => setState({
|
||||||
...state,
|
...state,
|
||||||
device_id
|
device_id: device_id ?? "",
|
||||||
})} />
|
})} />
|
||||||
<InputEntity value={state.entity_id ?? ""} onChange={entity_id => setState({
|
<InputEntity restrictToDomain={state.domain ? [state.domain] : undefined} value={state.entity_id ?? ""} multiple onChange={entity_id => setState({
|
||||||
...state,
|
...state,
|
||||||
entity_id
|
entity_id
|
||||||
})} />
|
})} />
|
||||||
|
|||||||
@@ -8,9 +8,7 @@ export const TriggerHAState: OptionManager<AutomationTriggerHA> = {
|
|||||||
"platform": "homeassistant",
|
"platform": "homeassistant",
|
||||||
"event": "start",
|
"event": "start",
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputList
|
<InputList
|
||||||
|
|||||||
@@ -10,9 +10,7 @@ export const TriggerMQTTState: OptionManager<AutomationTriggerMQTT> = {
|
|||||||
"topic": "",
|
"topic": "",
|
||||||
"value_template": ""
|
"value_template": ""
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputText
|
<InputText
|
||||||
|
|||||||
Loaded 100 of 143 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user