Compare commits

...
36 Commits
Author SHA1 Message Date
Ari Sosnovsky 359958aada 1.1.19 2022-06-05 23:16:30 -04:00
ari 7a73af4434 initial proto of mobile mode graph 2022-06-05 20:55:44 -04:00
ari 55bb941399 some fixes for invalid nodes 2022-06-04 23:36:12 -04:00
ari afb765024d clean up on actions 2022-06-04 22:12:32 -04:00
ari 911f867518 fixed up issues with saving 2022-06-04 22:10:41 -04:00
ari 25bb19dbe5 new logo 2022-06-04 21:32:45 -04:00
ari 9960ce2909 new logo 2022-06-04 21:25:42 -04:00
ari c2fde70954 logo 2022-06-04 21:13:54 -04:00
Ari Sosnovsky 5ca9c4a361 Prepped v0.1.17 (#12)
prepped v0.1.17
2022-06-04 20:56:42 -04:00
ari c27f2d13f0 no latest for tests 2022-06-04 18:40:57 -04:00
ari 26c81effd6 fixed routing issue 2022-06-04 17:54:32 -04:00
ari e72c83b980 location fix 2022-06-04 16:09:52 -04:00
ari e222c42150 fixed typing errors 2022-06-04 15:56:15 -04:00
ari e7b88fc6f6 ensured ci passes 2022-06-04 15:50:28 -04:00
ari 079f353dbf trying to just redirect ws 2022-06-04 15:45:14 -04:00
ari e6e51be5a5 using dockerhub 2022-06-01 21:50:01 -04:00
ari 3a6b21a117 updated ignore list 2022-06-01 21:48:31 -04:00
ari f42df5a70f added build actions to ghcr.io 2022-06-01 21:22:58 -04:00
ari 0c3e9b5ace added build actions to ghcr.io 2022-06-01 21:22:44 -04:00
ari bc773154c6 all the latest socket work 2022-06-01 21:17:16 -04:00
ari a530e5e6e0 clean ups 2022-05-31 17:13:15 -04:00
ari 1ad87c205d updated emitters 2022-05-31 13:28:11 -04:00
ari d45f72b168 badges 2022-05-31 13:21:31 -04:00
ari 0c7db09c32 removed desc 2022-05-31 12:50:53 -04:00
ari 2b1648eff2 added desc to build 2022-05-31 12:50:15 -04:00
ari 06356b46e9 deployment 2022-05-31 12:46:11 -04:00
ari 21fe64f4bf added supervisor token + snackbar for errors 2022-05-31 12:19:58 -04:00
ari e22f64dd51 updated all packages to latest 2022-05-31 11:24:37 -04:00
ari f1b24ec783 device id 2022-05-30 19:48:55 -04:00
ari 8a90b56ac3 fixed tsc 2022-05-30 15:20:42 -04:00
ari 7d111c853b slight improvement on condition editor for mobile 2022-05-30 15:14:47 -04:00
ari 0c72481729 clean up 2022-05-30 15:10:33 -04:00
ari 996626f9af input entities 2022-05-30 15:05:54 -04:00
ari 878035e748 added ha websockets 2022-05-29 22:06:21 -04:00
ari cc930ee4ac dealt with linitng errors 2022-05-29 21:06:43 -04:00
ari 169a2e9059 loaders 2022-05-27 16:43:31 -04:00
111 changed files with 5297 additions and 4121 deletions

No files matched your search

+9
View File
@@ -2,3 +2,12 @@ webapp/node_modules
webapp/build webapp/build
webapp/.storybook webapp/.storybook
webapp/.vscode webapp/.vscode
webapp/.env.local
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
-1
View File
@@ -30,5 +30,4 @@ jobs:
args: | args: |
--${{ matrix.arch }} \ --${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \ --version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target . --target .
-2
View File
@@ -1,6 +1,4 @@
name: Deploy name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
+1 -1
View File
@@ -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 .
+15 -2
View File
@@ -1,6 +1,19 @@
# Changelog # Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.1.14] - Material UI + Autocomplete v2 ## [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
View File
@@ -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
+27 -3
View File
@@ -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
+6 -2
View File
@@ -1,6 +1,10 @@
# Shortumation # Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/asosnovsky/Shortumation/Manual%20Build)
| | Stable | Edge
| --- | --- | ---
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge)
A better way to write automations in home-assistant without having to install and run a seperate automation engine! A better way to write automations in home-assistant without having to install and run a seperate automation engine!
@@ -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
View File
@@ -1,17 +1,14 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16) list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27) upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31) delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12) read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9) read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16) websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17) params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6) total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7) id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8) alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9) description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10) trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5) json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
+1 -2
View File
@@ -33,7 +33,7 @@ test:
coverage: coverage:
$(VENV_BIN)/coverage run -m unittest discover tests $(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=90 $(VENV_BIN)/coverage report -m --fail-under=85
clean: clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
@@ -43,5 +43,4 @@ clean:
run-local: run-local:
rm -f web rm -f web
ln -s ../webapp/build web ln -s ../webapp/build web
cd ../webapp && yarn build
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
+10 -5
View File
@@ -3,16 +3,16 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.env import ORIGIN, ROOT_FOLDER from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI: def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI() app = FastAPI()
if (ROOT_FOLDER / "web").exists(): if (ROOT_FOLDER / "web").exists():
app.mount( app.mount(
"/web", f"{API_PREFIX}/web",
StaticFiles( StaticFiles(
directory=ROOT_FOLDER / "web", directory=ROOT_FOLDER / "web",
html=True, html=True,
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
allow_headers=["*"], allow_headers=["*"],
) )
app.include_router(ping.router, prefix="/ping") app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations") app.include_router(
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details") automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
return app return app
+4 -4
View File
@@ -1,8 +1,6 @@
from datetime import datetime
from fastapi import APIRouter from fastapi import APIRouter
from src.env import BUILD_VERSION from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig from src.hass_config import HassConfig
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter() router = APIRouter()
@router.get("/") @router.get("/")
def read_ping(): def read_details():
return { return {
"version": BUILD_VERSION, "version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(), "config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(), "tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(), "autos": hass_config.get_automation_path(),
+29
View File
@@ -0,0 +1,29 @@
import asyncio
import json
from fastapi import APIRouter, WebSocket
from src.ws_redirect import WSRedirector
router = APIRouter()
@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:
await conn.send(await websocket.receive_text())
await websocket.accept()
await asyncio.gather(
conn.start(),
wait_for_data(),
)
+3
View File
@@ -4,5 +4,8 @@ from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute() ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0") BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO") LOG_LEVEL = config("LOG_LEVEL", "INFO")
API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*") ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+49
View File
@@ -0,0 +1,49 @@
import json
from typing import Any, Callable, Coroutine, Optional
import websockets
from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import logger
OnMessage = Callable[[str], Coroutine]
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[Any] = 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 websockets.connect(self._host) as websocket:
self._client = websocket
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
while not self.is_closed:
msg = await websocket.recv()
logger.debug(f"WS:MSG: {msg}")
await self.process_message(msg)
async def process_message(self, msg: str):
await self._on_message(msg)
def close(self):
self._close = True
def __del__(self):
self.close()
+5 -6
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: v0.1.14 version: v0.1.19
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: {}
+2 -2
View File
@@ -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
View File
@@ -3,5 +3,8 @@ services:
addon: addon:
volumes: volumes:
- "./sample_config:/config" - "./sample_config:/config"
- "./api/tests:/app/tests"
ports: ports:
- "8000:8000" - "8000:8000"
env_file:
- api/.env
+10
View File
@@ -0,0 +1,10 @@
#!/bin/bash
api_location=${1}
pushd $api_location
echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION
echo $(python --version)
echo "--------------------"
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
-4
View File
@@ -1,4 +0,0 @@
#!/bin/bash
echo $(python --version)
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
+1 -1
View File
@@ -1,5 +1,5 @@
0: 0:
Type: Generic Type: Generic2
1: 1:
Type: Generic Type: Generic
2: 2:
+1 -1
View File
@@ -1 +1 @@
SKIP_PREFLIGHT_CHECK=true SKIP_PREFLIGHT_CHECK=true
+3
View File
@@ -1,4 +1,7 @@
module.exports = { module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [ "stories": [
"../src/**/*.stories.mdx", "../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)" "../src/**/*.stories.@(js|jsx|ts|tsx)"
+23 -13
View File
@@ -8,22 +8,27 @@
"@emotion/styled": "^11.8.1", "@emotion/styled": "^11.8.1",
"@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-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2", "react-flow-renderer": "^10.1.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 +76,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",
+1
View File
@@ -6,6 +6,7 @@ import { ErrorBoundary } from 'components/ErrorBoundary';
function App() { function App() {
const api = useConnectedApiService(); const api = useConnectedApiService();
return ( return (
<div className="app"> <div className="app">
<ErrorBoundary> <ErrorBoundary>
+6 -3
View File
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
data = {} data = {}
}) { }) {
try { try {
const reply = await fetch(baseURL + path, { const payload: RequestInit = {
method, method,
headers: { headers: {
"Content-Type": "application/json" "Content-Type": "application/json"
}, },
body: JSON.stringify(data), };
}); if (method !== 'GET') {
payload["body"] = JSON.stringify(data);
}
const reply = await fetch(baseURL + path, payload);
let response: APIResponse<any>; let response: APIResponse<any>;
if (reply.status === 200) { if (reply.status === 200) {
response = { response = {
+11 -7
View File
@@ -4,14 +4,18 @@ import { makeRemoteAPI } from "./base";
import { useAPIService } from './core'; import { useAPIService } from './core';
import { useMockAPI } from "./mock"; import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i); const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
"http://localhost:8000" :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService( export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI( makeAutomationAPI(remoteAutoAPI)
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
); );
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService( export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos)) makeAutomationAPI(useMockAPI(initialAutos))
+1 -1
View File
@@ -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;
}; };
@@ -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%;
@@ -74,4 +75,26 @@
.automation-editor--info-box.hide>.automation-editor--info-box--icon { .automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg); transform: rotate(180deg);
z-index: 2; z-index: 2;
}
.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)
@@ -11,6 +11,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;
@@ -41,7 +43,9 @@ export const AutomationEditor: FC<Props> = ({
// 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 +57,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,7 +69,8 @@ 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(" ")}>
@@ -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,
}
@@ -1,6 +1,6 @@
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";
@@ -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;
+16 -6
View File
@@ -1,7 +1,7 @@
import "./index.css"; import "./index.css";
import "./index.mobile.css"; import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor"; import { AutomationEditor } from "components/AutomationEditor";
import { FC, useState } from "react"; import { FC, ReactNode, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults'; import { defaultAutomation } from 'utils/defaults';
import { ArrowIcon } from "components/Icons"; import { ArrowIcon } from "components/Icons";
@@ -11,6 +11,8 @@ 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";
interface AutomationListParams { interface AutomationListParams {
@@ -19,6 +21,7 @@ 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 AutomationList: FC<AutomationListParams> = ({ export const AutomationList: FC<AutomationListParams> = ({
@@ -57,15 +60,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>
@@ -88,7 +93,12 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
dims dims
}) => { }) => {
if (!automations.ready) { if (!automations.ready) {
return <span>Loading...</span> return <div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div>
} }
if (!automations.ok) { if (!automations.ok) {
return <span>Error {automations.error}</span> return <span>Error {automations.error}</span>
@@ -8,6 +8,7 @@ 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";
@@ -31,6 +32,7 @@ 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();
// alias // alias
const effectiveDM = internalDisplayMode || yamlMode; const effectiveDM = internalDisplayMode || yamlMode;
// effect // effect
@@ -76,54 +78,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,7 +2,7 @@ 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";
@@ -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',
+4 -2
View File
@@ -12,6 +12,7 @@ export interface DAGCircleProps {
backgroundColor?: string; backgroundColor?: string;
disableSource?: boolean; disableSource?: boolean;
disableTarget?: boolean; disableTarget?: boolean;
flipped: boolean;
} }
export const makeFlowCircle = ( export const makeFlowCircle = (
circleId: string, circleId: string,
@@ -32,6 +33,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor, backgroundColor,
disableSource = false, disableSource = false,
disableTarget = false, disableTarget = false,
flipped,
} }
}) => { }) => {
const { classes } = useCircleStyles({ const { classes } = useCircleStyles({
@@ -41,8 +43,8 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor, backgroundColor,
}); });
return <> return <>
{!disableSource && <Handle type="source" position={Position.Right} />} {!disableSource && <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />}
{!disableTarget && <Handle type="target" position={Position.Left} />} {!disableTarget && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<div className={classes.root}> <div className={classes.root}>
{ {
onAdd ? onAdd ?
@@ -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,
+4 -2
View File
@@ -14,6 +14,7 @@ export interface DAGNodeProps {
label: string; label: string;
hasInput?: boolean; hasInput?: boolean;
accentBackground?: boolean; accentBackground?: boolean;
flipped: boolean;
} }
export const DAGNode: FC<DAGNodeProps> = ({ export const DAGNode: FC<DAGNodeProps> = ({
label, label,
@@ -24,6 +25,7 @@ export const DAGNode: FC<DAGNodeProps> = ({
color, color,
hasInput = false, hasInput = false,
accentBackground = false, accentBackground = false,
flipped,
}) => { }) => {
const { classes, theme } = useNodeStyles({ const { classes, theme } = useNodeStyles({
color, color,
@@ -32,8 +34,8 @@ export const DAGNode: FC<DAGNodeProps> = ({
accentBackground, accentBackground,
}); });
return <> return <>
{hasInput && <Handle type="target" position={Position.Left} />} {hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={Position.Right} /> <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={classes.root}> <div className={classes.root}>
<div className={classes.inner}> <div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}> <div className={classes.leftEdge} onClick={onXClick}>
@@ -19,4 +19,5 @@ export const DEFAULT_DIMS = {
x: PADDING, x: PADDING,
y: PADDING, y: PADDING,
}, },
flipped: false,
} as DAGAutomationFlowDims } as DAGAutomationFlowDims
+9 -10
View File
@@ -1,19 +1,22 @@
import { makeFlowCircle } from "./DAGCircle" import { DAGCircleProps, makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims } from "./types" import { DAGAutomationFlowDims } from "./types"
import { XYPosition } from 'react-flow-renderer'; import { Node, XYPosition } from 'react-flow-renderer';
import { DAGNodeProps } from "./DAGNode";
export const makeAddButton = ( export const makeAddButton = (
id: string, id: string,
position: XYPosition, position: XYPosition,
{ {
circleSize, circleSize,
flipped,
}: DAGAutomationFlowDims, }: DAGAutomationFlowDims,
onAdd: () => void, onAdd: () => void,
disableTarget: boolean = true, disableTarget: boolean = true,
) => makeFlowCircle( ): Node<DAGCircleProps> => makeFlowCircle(
id, id,
position, position,
{ {
flipped,
size: circleSize, size: circleSize,
onAdd, onAdd,
disableSource: true, disableSource: true,
@@ -25,22 +28,17 @@ export const makeConditionPoint = (
id: string, id: string,
position: XYPosition, position: XYPosition,
{ {
padding,
conditionWidth, conditionWidth,
conditionHeight, conditionHeight,
nodeWidth, flipped,
nodeHeight,
circleSize,
distanceFactor,
}: DAGAutomationFlowDims, }: DAGAutomationFlowDims,
totalConditions: number, totalConditions: number,
onEditClick: () => void, onEditClick: () => void,
) => ({ ): Node<DAGNodeProps> => ({
id, id,
type: 'dagnode', type: 'dagnode',
position, position,
data: { data: {
size: circleSize,
color: 'lblue', color: 'lblue',
accentBackground: true, accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`, label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
@@ -48,5 +46,6 @@ export const makeConditionPoint = (
width: conditionWidth, width: conditionWidth,
hasInput: true, hasInput: true,
onEditClick, onEditClick,
flipped,
} }
}) })
@@ -92,7 +92,10 @@ Complex.args = {
{ {
"platform": "homeassistant", "platform": "homeassistant",
"event": "start", "event": "start",
} },
{
"bad": "node"
} as any
], ],
sequence: [ sequence: [
{ {
@@ -120,6 +123,9 @@ Complex.args = {
"media_content_type": "SPOTIFY" "media_content_type": "SPOTIFY"
} }
}, },
{
"alias": "Bad Node",
},
{ {
"choose": [ "choose": [
{ {
@@ -231,4 +237,27 @@ Errors.args = {
"choose": {} "choose": {}
} as any } as any
] ]
}
export const ComplexFlipped = Complex.bind({})
ComplexFlipped.args = {
...Complex.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
export const SimpleFlipped = Simple.bind({})
SimpleFlipped.args = {
...Simple.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
} }
+14 -3
View File
@@ -60,13 +60,17 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
// modal // modal
let modalBody = <></> let modalBody = <></>
console.log(modalState)
if (modalState) { if (modalState) {
if (modalState.single) { if (modalState.single) {
modalBody = <NodeEditor modalBody = <NodeEditor
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(
@@ -120,7 +128,10 @@ 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,
} }
@@ -25,12 +25,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
}; };
@@ -67,7 +73,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,6 +117,7 @@ const addSingleNode = (
position: XYPosition, position: XYPosition,
nodeId: string, nodeId: string,
{ {
flipped,
nodeHeight, nodeHeight,
nodeWidth, nodeWidth,
}: DAGAutomationFlowDims, }: DAGAutomationFlowDims,
@@ -120,6 +134,7 @@ const addSingleNode = (
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,
@@ -172,10 +187,14 @@ const addChooseNode = (
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 +206,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,7 +223,10 @@ 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,
}, },
@@ -209,7 +234,13 @@ const addChooseNode = (
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 +248,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,15 +272,21 @@ 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,
}, },
@@ -16,6 +16,9 @@ export const triggerToFlow = (
nodeWidth, nodeWidth,
padding, padding,
conditionHeight, conditionHeight,
conditionWidth,
circleSize,
flipped,
} = dims; } = dims;
// convert all triggers to dag nodes // convert all triggers to dag nodes
trigger.forEach((t, i) => { trigger.forEach((t, i) => {
@@ -27,11 +30,18 @@ export const triggerToFlow = (
label: getDescriptionFromAutomationNode(t), label: getDescriptionFromAutomationNode(t),
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 +53,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,
}, },
+1
View File
@@ -15,6 +15,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>;
+13 -9
View File
@@ -27,19 +27,23 @@ export const makeSequenceUpdater = (
choose: [], choose: [],
default: [], default: [],
}, },
update: n => onChange([ update: n => {
...sequence, onChange([
n, ...sequence,
]), n,
])
},
allowedTypes: ['action', 'condition'] allowedTypes: ['action', 'condition']
}) })
}, },
updateNode(i: number, node: AutomationSequenceNode) { updateNode(i: number, node: AutomationSequenceNode) {
return onChange([ if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
...sequence.slice(0, i), return onChange([
node, ...sequence.slice(0, i),
...sequence.slice(i + 1), node,
]) ...sequence.slice(i + 1),
])
}
}, },
updateChooseActionData(i: number, data: ChooseAction) { updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction; const node = sequence[i] as ChooseAction;
@@ -1,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
+3 -3
View File
@@ -5,7 +5,7 @@ import { createAppUseStyles } from 'styles/theme';
export interface ButtonIconStyleProps { export interface ButtonIconStyleProps {
} }
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps { export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
children: FC<IconBaseProps>; Icon: FC<IconBaseProps>;
} }
const useButtonIconStyles = createAppUseStyles(theme => ({ const useButtonIconStyles = createAppUseStyles(theme => ({
buttonIcon: { buttonIcon: {
@@ -22,9 +22,9 @@ const useButtonIconStyles = createAppUseStyles(theme => ({
export const ButtonIcon: FC<ButtonIconProps> = ({ export const ButtonIcon: FC<ButtonIconProps> = ({
children: Child, Icon,
className, className,
...props ...props
}) => <Child }) => <Icon
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props} className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
/> />
@@ -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,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.bathroom'
} as any
@@ -0,0 +1,117 @@
import "./InputEntities.css";
import { FC } from "react";
import { useHADeviceRegistry } from 'haService';
import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { EntityId } from 'types/automations/common';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
import { prettyName } from 'utils/formatting';
export type InputEntityProps = {
label?: string,
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: EntityId;
multiple: true;
onChange: (v: string[]) => void;
})
export const InputDevice: FC<InputEntityProps> = props => {
// state
const dr = useHADeviceRegistry();
// processing of inputs
const options = dr.getOptions();
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : [];
// 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-entities"
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={dr.getLabel}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.manufacturer) : ''}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase();
return opts.map(opt => {
let similarityScore = 0;
const eid = dr.getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
const name = dr.getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
return {
label: name,
id: eid,
similarityScore,
manufacturer: (typeof opt === 'string') ? '' : opt.manufacturer ?? ""
}
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
return (a.similarityScore > b.similarityScore) ? 1 : -1
})
}}
renderOption={(prop, option, { inputValue }) => {
const label = dr.getLabel(option);
const id = dr.getID(option);
return <SearchItem
listProps={prop}
id={id}
label={label}
searchTerm={inputValue}
/>
}}
renderInput={params => <TextField
{...params}
variant="filled"
label={props.label ?? "Device"}
/>}
renderTags={(tagValue, getTagProps) => <Badge badgeContent={tagValue.length} color="info">
<div className="input-entities--tags">
{tagValue.map((option, index) => {
const label = dr.getLabel(option);
const id = dr.getID(option);
const props = getTagProps({ index });
props.className += ' input-entities--chip'
return (
<Chip
size="medium"
label={<>
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
{(id !== label) && <small>{id}</small>}
</>}
{...props}
/>
)
})}
</div>
</Badge>
}
/>
}
@@ -0,0 +1,35 @@
.input-entities .BaseBadge-root {
max-width: 100%;
}
.input-entities--chip>span {
display: flex;
flex-direction: row;
gap: 0.15em;
}
.input-entities--chip>span>small::before {
content: "/ ";
}
.input-entities--chip>span>small {
size: 0.15em;
}
.input-entities--errors {
margin-top: 0.75em;
}
.input-entities--errors ul {
padding: 0 0 0 1em;
margin: 0;
max-height: 2.5em;
overflow-y: auto;
overflow-x: hidden;
}
.input-entities--tags {
max-height: 5em;
max-width: 100%;
overflow: auto;
}
@@ -0,0 +1,138 @@
import "./InputEntities.css";
import { FC } from "react";
import { useHAEntities } from 'haService';
import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { prettyName } from "utils/formatting";
import { EntityId } from 'types/automations/common';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
export type InputEntityProps = {
restrictToDomain?: string[],
label?: string,
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: EntityId;
multiple: true;
onChange: (v: string[]) => void;
})
export const InputEntity: FC<InputEntityProps> = props => {
// state
const entities = useHAEntities();
// processing of inputs
const options = entities.getOptions(props.restrictToDomain);
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : [];
const errors = entities.validateOptions(value, props.restrictToDomain);
// processing of errors
let helperText = <></>;
let error: boolean = false;
if (errors !== null) {
error = true
if (errors.length > 0) {
helperText = <Badge
className="input-entities--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-entities"
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={entities.getLabel}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase();
return opts.map(opt => {
let similarityScore = 0;
const eid = entities.getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
const name = entities.getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
return {
label: name,
id: eid,
domain: (typeof opt === 'string') ? '' : opt.domain,
similarityScore
}
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
return (a.similarityScore > b.similarityScore) ? 1 : -1
})
}}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
renderOption={(prop, option, { inputValue }) => {
const label = entities.getLabel(option);
const id = entities.getID(option);
return <SearchItem
listProps={prop}
id={id}
label={label}
searchTerm={inputValue}
/>
}}
renderInput={params => <TextField
{...params}
variant="filled"
label={props.label ?? "Entity ID"}
helperText={helperText}
error={error}
/>}
renderTags={(tagValue, getTagProps) => <Badge badgeContent={tagValue.length} color="info">
<div className="input-entities--tags">
{tagValue.map((option, index) => {
const label = entities.getLabel(option);
const id = entities.getID(option);
const props = getTagProps({ index });
props.className += ' input-entities--chip'
return (
<Chip
size="medium"
label={<>
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
{(id !== label) && <small>{id}</small>}
</>}
{...props}
/>
)
})}
</div>
</Badge>
}
/>
}
@@ -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
@@ -49,26 +49,4 @@ export const InputList: FC<Props<any>> = ({
</Select> </Select>
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText> <FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
</FormControl> </FormControl>
// return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
// <select
// title={invalidCurrent ? "Invalid Selection" : ""}
// className={classes.input}
// {...selattr} value={current}
// onChange={e => {
// e.preventDefault();
// if (e.currentTarget.id === 'invalid') {
// onChange(options[0])
// } else {
// onChange(e.currentTarget.value as any);
// }
// }}
// >
// {options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
// {invalidCurrent ? <option
// id={'invalid'}
// value={current}
// style={{ display: 'none' }}
// >!{current}!</option> : <></>}
// </select>
// </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"
/>
@@ -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 })
+11 -3
View File
@@ -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,20 @@ 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,
} }
export default function InputYaml<T>({ export default function InputYaml<T>({
label, label,
error: incmError,
value = {} as any, value = {} as any,
onChange, onChange,
}: 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 +33,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) {
@@ -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
+9
View File
@@ -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: "/ ";
}
+47
View File
@@ -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>
+2 -1
View File
@@ -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 }) => ({
@@ -33,4 +33,16 @@
.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,9 +1,10 @@
import { HAEntitiesState } from 'haService';
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 interface 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;
} }
@@ -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
@@ -1,7 +1,7 @@
import { OptionManager } from './OptionManager'; import { OptionManager } from './OptionManager';
import { AutomationTriggerNumericState } from 'types/automations/triggers'; import { AutomationTriggerNumericState } 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 InputNumber from 'components/Inputs/InputNumber'; import InputNumber from 'components/Inputs/InputNumber';
import InputTime from 'components/Inputs/InputTime'; import InputTime from 'components/Inputs/InputTime';
import InputYaml from 'components/Inputs/InputYaml'; import InputYaml from 'components/Inputs/InputYaml';
@@ -12,13 +12,12 @@ export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> =
"platform": 'numeric_state', "platform": 'numeric_state',
"entity_id": "", "entity_id": "",
}), }),
isReady: ({ }) => { isReady: () => true,
return true
},
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
return <> return <>
<InputEntity <InputEntity
value={state.entity_id} value={state.entity_id}
multiple
onChange={entity_id => setState({ onChange={entity_id => setState({
...state, ...state,
entity_id entity_id
@@ -1,7 +1,7 @@
import { OptionManager } from './OptionManager'; import { OptionManager } from './OptionManager';
import { AutomationTriggerState } from 'types/automations/triggers'; import { AutomationTriggerState } 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 InputTime from 'components/Inputs/InputTime'; import InputTime from 'components/Inputs/InputTime';
@@ -10,13 +10,12 @@ export const TriggerState: OptionManager<AutomationTriggerState> = {
"platform": 'state', "platform": 'state',
"entity_id": "", "entity_id": "",
}), }),
isReady: ({ }) => { isReady: () => true,
return true
},
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
return <> return <>
<InputEntity <InputEntity
value={state.entity_id} value={state.entity_id}
multiple
onChange={entity_id => setState({ onChange={entity_id => setState({
...state, ...state,
entity_id entity_id
@@ -9,9 +9,7 @@ export const TriggerTemplate: OptionManager<AutomationTriggerTemplate> = {
"platform": 'template', "platform": 'template',
"value_template": "", "value_template": "",
}), }),
isReady: ({ }) => { isReady: () => true,
return true
},
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
return <> return <>
<InputText <InputText
@@ -9,9 +9,7 @@ export const TriggerTime: OptionManager<AutomationTriggerTime> = {
"platform": 'time', "platform": 'time',
"at": "", "at": "",
}), }),
isReady: ({ }) => { isReady: () => true,
return true
},
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
return <> return <>
<InputTime <InputTime
@@ -7,9 +7,7 @@ export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
defaultState: () => ({ defaultState: () => ({
"platform": 'time_pattern', "platform": 'time_pattern',
}), }),
isReady: ({ }) => { isReady: () => true,
return true
},
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
return <> return <>
<InputText label="Hours" value={state.hours ?? ""} onChange={hours => setState({ <InputText label="Hours" value={state.hours ?? ""} onChange={hours => setState({
@@ -8,9 +8,7 @@ export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
"platform": 'webhook', "platform": 'webhook',
"webhook_id": "", "webhook_id": "",
}), }),
isReady: ({ }) => { isReady: () => true,
return true
},
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
return <> return <>
<InputText label="Webhook ID" value={state.webhook_id ?? ""} onChange={webhook_id => setState({ <InputText label="Webhook ID" value={state.webhook_id ?? ""} onChange={webhook_id => setState({
@@ -1,8 +1,7 @@
import { OptionManager } from './OptionManager'; import { OptionManager } from './OptionManager';
import { AutomationTriggerZone } from 'types/automations/triggers'; import { AutomationTriggerZone } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputList } from 'components/Inputs/InputList'; import { InputList } from 'components/Inputs/InputList';
import { InputEntity } from 'components/Inputs/InputTextBubble'; import { InputEntity } from 'components/Inputs/InputEntities';
export const TriggerZone: OptionManager<AutomationTriggerZone> = { export const TriggerZone: OptionManager<AutomationTriggerZone> = {
@@ -12,14 +11,12 @@ export const TriggerZone: OptionManager<AutomationTriggerZone> = {
"event": "enter", "event": "enter",
"entity_id": "", "entity_id": "",
}), }),
isReady: ({ }) => { isReady: () => true,
return true
},
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
return <> return <>
<InputText label="Zone" value={state.zone ?? ""} onChange={zone => setState({ <InputEntity label="Zone" restrictToDomain={['zone']} value={state.zone} onChange={zone => setState({
...state, ...state,
zone zone: zone ?? ""
})} /> })} />
<InputList <InputList
label="Event" label="Event"
@@ -30,6 +27,8 @@ export const TriggerZone: OptionManager<AutomationTriggerZone> = {
})} })}
/> />
<InputEntity <InputEntity
multiple
restrictToDomain={["device_tracker", "person"]}
value={state.entity_id} value={state.entity_id}
onChange={entity_id => setState({ onChange={entity_id => setState({
...state, ...state,
@@ -2,40 +2,44 @@ import { Dispatch, SetStateAction, useEffect, useState } from 'react';
import { AutomationNode, AutomationNodeTypes } from 'types/automations'; import { AutomationNode, AutomationNodeTypes } from 'types/automations';
import { AutomationNodeSubtype } from 'types/automations'; import { AutomationNodeSubtype } from 'types/automations';
import { getOptionManager } from './getOptionManager'; import { getOptionManager } from './getOptionManager';
import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations'; import { getNodeSubType, getSubTypeList, validateNode } from 'utils/automations';
import InputYaml from 'components/Inputs/InputYaml'; import InputYaml from 'components/Inputs/InputYaml';
import InputText from 'components/Inputs/InputText'; import InputText from 'components/Inputs/InputText';
import { getDescriptionFromAutomationNode } from 'utils/formatting'; import { getDescriptionFromAutomationNode } from 'utils/formatting';
import { useHAEntities } from 'haService';
import { Generic } from './Generic';
import { getNodeTypeAndValidate } from '../../../utils/automations';
type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>] type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>]
export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, uState: UseState = useState) => { export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, allowedTypes: AutomationNodeTypes[], uState: UseState = useState) => {
// state
const [allState, setAllState] = uState({ const [allState, setAllState] = uState({
yamlMode: false, yamlMode: false,
isModified: false, isModified: false,
...computeInvalidYaml(originalNode) ...computeInvalidYaml(originalNode, allowedTypes)
}); });
const entities = useHAEntities();
// aliases
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState; const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
// effects
useEffect(() => { useEffect(() => {
setAllState({ ...allState, node: originalNode, isModified: false, }) setAllState({ ...allState, node: originalNode, isModified: false, })
// eslint-disable-next-line // eslint-disable-next-line
}, [originalNode]) }, [originalNode])
// function aliases
const setState = (node: AutomationNode) => setAllState(({ const setState = (node: AutomationNode) => setAllState(({
...allState, node, ...allState, node,
isModified: JSON.stringify(node) !== JSON.stringify(originalNode), isModified: JSON.stringify(node) !== JSON.stringify(originalNode),
})); }));
const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, }); const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, });
const setStateForManualYaml = (yaml: any) => { const setStateForManualYaml = (yaml: any) => {
try { setAllState({
createData(yaml, yaml) ...allState,
setAllState({ ...computeInvalidYaml(yaml, allowedTypes)
...allState, })
...computeInvalidYaml(yaml)
})
} catch (err) {
setAllState({ ...allState, invalidManualYaml: <>{String(err)}</>, isErrored: true, })
}
} }
// value aliases
const { const {
originalNodeType, originalNodeType,
originalNodeSubType, originalNodeSubType,
@@ -43,7 +47,8 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
subType, subType,
subTypes, subTypes,
optionManager, optionManager,
} = createData(originalNode, currentNode); } = createData(originalNode, currentNode, allowedTypes)
// publuc
return { return {
nodeType, nodeType,
subType, subType,
@@ -52,6 +57,13 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
invalidManualYaml, invalidManualYaml,
isModified, isModified,
isErrored: allState.isErrored, isErrored: allState.isErrored,
get prettyNodeType() {
if (nodeType) {
return `${nodeType.slice(0, 1).toUpperCase()}${nodeType.slice(1)} Type`
} else {
return 'n/a'
}
},
get yamlMode() { get yamlMode() {
return allState.isErrored || yamlMode return allState.isErrored || yamlMode
}, },
@@ -59,9 +71,11 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
return currentNode return currentNode
}, },
renderOptionList() { renderOptionList() {
console.log('rendering option list')
let aliasEditor = <></> let aliasEditor = <></>
if (nodeType === 'trigger') { if (nodeType === 'trigger') {
aliasEditor = <InputText aliasEditor = <InputText
key="alias"
label="Trigger ID" label="Trigger ID"
value={(allState.node as any).id} value={(allState.node as any).id}
onChange={id => setState({ onChange={id => setState({
@@ -72,6 +86,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
} }
if (nodeType === 'action') { if (nodeType === 'action') {
aliasEditor = <InputText aliasEditor = <InputText
key="alias"
label="Alias" label="Alias"
value={getDescriptionFromAutomationNode(allState.node)} value={getDescriptionFromAutomationNode(allState.node)}
onChange={alias => setState({ onChange={alias => setState({
@@ -87,13 +102,13 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
label='' label=''
value={currentNode} value={currentNode}
onChange={setStateForManualYaml} onChange={setStateForManualYaml}
error={invalidManualYaml}
/> />
<div className="node-editor--error">{invalidManualYaml}</div>
</> </>
} }
return <> return <>
{aliasEditor} {aliasEditor}
{optionManager.renderOptionList(currentNode, setState)} {optionManager.renderOptionList(currentNode, setState, entities)}
</>; </>;
}, },
isReady() { isReady() {
@@ -106,25 +121,43 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
setState(getOptionManager(newType, getSubTypeList(newType)[0]).defaultState()) setState(getOptionManager(newType, getSubTypeList(newType)[0]).defaultState())
} }
}, },
setSubType(newSubType: AutomationNodeSubtype<typeof nodeType>) { setSubType(newSubType: AutomationNodeSubtype) {
if (newSubType === originalNodeSubType) { if (newSubType === originalNodeSubType) {
setState(originalNode) setState(originalNode)
} else { } else {
setState(getOptionManager(nodeType, newSubType as any).defaultState()) if (nodeType) {
setState(getOptionManager(nodeType, newSubType as any).defaultState())
} else {
setState(getOptionManager(allowedTypes[0], newSubType as any).defaultState())
}
} }
} }
} }
} }
const createData = (originalNode: AutomationNode, currentNode: AutomationNode) => { const createData = (originalNode: AutomationNode, currentNode: AutomationNode, allowedTypes: AutomationNodeTypes[]) => {
const originalNodeType = getNodeType(originalNode); let originalNodeType: AutomationNodeTypes = allowedTypes[0];
const originalNodeSubType = getNodeSubType(originalNode); let originalNodeSubType: AutomationNodeSubtype | null = null;
const nodeType = getNodeType(currentNode); let nodeType: AutomationNodeTypes = originalNodeType;
const subType = getNodeSubType(currentNode); let subType: AutomationNodeSubtype | null = originalNodeSubType;
const subTypes = getSubTypeList(nodeType) let subTypes: AutomationNodeSubtype[] = getSubTypeList(allowedTypes[0]);
const optionManager = getOptionManager(nodeType, subType as any); let optionManager = Generic;
try {
originalNodeType = getNodeTypeAndValidate(originalNode, allowedTypes);
originalNodeSubType = getNodeSubType(originalNode);
} catch (err) {
console.error(`ORIGINAL NODE ERROR ${JSON.stringify(originalNode)}`)
}
try {
nodeType = getNodeTypeAndValidate(currentNode, allowedTypes);
subType = getNodeSubType(currentNode);
subTypes = getSubTypeList(nodeType)
optionManager = getOptionManager(nodeType, subType as any);
} catch (err) {
console.error(`CURRENT NODE ERROR ${JSON.stringify(currentNode)}`)
}
return { return {
originalNodeType, originalNodeType,
originalNodeSubType, originalNodeSubType,
@@ -135,13 +168,14 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode) =
} }
} }
const computeInvalidYaml = (node: AutomationNode) => { const computeInvalidYaml = (node: AutomationNode, allowedNodeTypes: AutomationNodeTypes[]) => {
const errors = validateNode(node); const errors = validateNode(node, allowedNodeTypes);
if (errors) { if (errors) {
console.log({ errors })
return { return {
node, node,
isErrored: true, isErrored: true,
invalidManualYaml: <ul key={'error'}> invalidManualYaml: <ul key={'error'} className="node-editor--error">
{errors.map(({ message, path }, i) => <li key={i}> {errors.map(({ message, path }, i) => <li key={i}>
<b>{path}</b>: {message} <b>{path}</b>: {message}
</li>)} </li>)}
@@ -58,4 +58,9 @@
max-width: 30em; max-width: 30em;
overflow: auto; overflow: auto;
max-height: 10em; max-height: 10em;
display: flex;
flex-direction: column;
align-items: flex-start;
padding: 0 0.5em 0 1.5em;
margin: 0;
} }
@@ -65,6 +65,14 @@ UnSupported.args = {
} as any, } as any,
} }
export const DeviceTriggerExample = Action.bind({})
DeviceTriggerExample.args = {
...DeviceTriggerExample.args,
node: {
"platform": 'device',
},
}
export const InAModal: ComponentStory<typeof NodeEditor> = props => { export const InAModal: ComponentStory<typeof NodeEditor> = props => {
+5 -8
View File
@@ -1,6 +1,6 @@
import "./index.css"; import "./index.css";
import { FC } from 'react'; import { FC, ReactNode } from 'react';
import { AutomationNode, AutomationNodeMapping } from 'types/automations/index'; import { AutomationNode, AutomationNodeMapping } from 'types/automations/index';
import { useEditorNodeState } from "./OptionManager"; import { useEditorNodeState } from "./OptionManager";
import { InputList } from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
@@ -15,6 +15,7 @@ export interface NodeEditorProps {
onFlags?: (isReady: boolean, isModified: boolean) => void; onFlags?: (isReady: boolean, isModified: boolean) => void;
saveBtnCreateText?: boolean; saveBtnCreateText?: boolean;
isErrored?: boolean; isErrored?: boolean;
children?: ReactNode;
} }
export const NodeEditor: FC<NodeEditorProps> = ({ export const NodeEditor: FC<NodeEditorProps> = ({
@@ -28,7 +29,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
isErrored = false, isErrored = false,
}) => { }) => {
// state // state
const state = useEditorNodeState(node, isErrored); const state = useEditorNodeState(node, isErrored, allowedTypes);
// alias // alias
const isModified = state.isModified; const isModified = state.isModified;
@@ -52,7 +53,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
onChange={state.setNodeType} onChange={state.setNodeType}
/> : <></>} /> : <></>}
{state.nodeType !== 'condition' ? <InputList {state.nodeType !== 'condition' ? <InputList
label={`${state.nodeType.slice(0, 1).toUpperCase()}${state.nodeType.slice(1)} Type`} label={state.prettyNodeType}
current={state.subType as any} current={state.subType as any}
options={state.subTypes} options={state.subTypes}
onChange={state.setSubType} onChange={state.setSubType}
@@ -67,11 +68,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
className="node-editor--footer--save" className="node-editor--footer--save"
onClick={() => { onClick={() => {
if (areYouSureNotReady('save')) { if (areYouSureNotReady('save')) {
if (JSON.stringify(state.data) !== JSON.stringify(node)) { onSave(state.data)
onSave(state.data)
} else {
onClose()
}
} }
}} }}
title={ title={
+67 -10
View File
@@ -1,7 +1,10 @@
import "./index.css"; import "./index.css";
import { FC } from 'react'; import { createRef, FC, ReactNode, useEffect, useRef } from 'react';
import { createTheme, ThemeProvider } from '@mui/material/styles'; import { createTheme, ThemeProvider, useTheme } from '@mui/material/styles';
import { VersionBox } from "components/VersionBox"; import { VersionBox } from "components/VersionBox";
import { SnackbarKey, SnackbarProvider, useSnackbar } from 'notistack';
import { Button } from "@mui/material";
import { useHAConnection } from 'haService/connection';
const theme = createTheme({ const theme = createTheme({
palette: { palette: {
@@ -9,15 +12,69 @@ const theme = createTheme({
}, },
}); });
export const InternalPage: FC<{
children: ReactNode
}> = ({ children }) => {
const conn = useHAConnection();
const theme = useTheme();
const snackbar = useSnackbar();
const snackbarKeyHAConKey = useRef<SnackbarKey | null>(null);
export const Page: FC = ({ children }) => { useEffect(() => {
if (conn.status === 'error') {
if (snackbarKeyHAConKey.current) {
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
}
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Failed to connect to homeassistant due to "${JSON.stringify(conn.error)}"`, {
"variant": "error",
"persist": true,
})
} else if (conn.status === 'loading') {
if (snackbarKeyHAConKey.current) {
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
}
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Connecting to websocket...`, {
"variant": "info",
})
} else if (conn.status === "loaded") {
if (snackbarKeyHAConKey.current) {
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
}
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Connected to HA!`, {
"variant": "success",
})
}
}, [conn, snackbar])
return <main className="page" style={{
color: theme.palette.text.primary,
background: theme.palette.background.default,
}}>
<VersionBox />
{children}
</main>
}
export const Page: FC<{
children: ReactNode
}> = ({ children }) => {
const notistackRef = createRef<any>();
const onClickDismiss = (key: SnackbarKey) => () => {
notistackRef.current.closeSnackbar(key);
}
return <ThemeProvider theme={theme}> return <ThemeProvider theme={theme}>
<main className="page" style={{ <SnackbarProvider
color: theme.palette.text.primary, anchorOrigin={{
background: theme.palette.background.default, "vertical": "bottom",
}}> "horizontal": "center"
<VersionBox /> }}
{children} ref={notistackRef}
</main> action={key => <Button onClick={onClickDismiss(key)}>Dismiss</Button>}
dense preventDuplicate
>
<InternalPage>
{children}
</InternalPage>
</SnackbarProvider>
</ThemeProvider> </ThemeProvider>
} }
+21
View File
@@ -0,0 +1,21 @@
import { Connection, getCollection } from "home-assistant-js-websocket";
import { DeviceRegistryItem, HassDevices } from './types';
export const fetchDeviceRegistry = (conn: Connection): Promise<Record<string, DeviceRegistryItem>> =>
conn.sendMessagePromise<HassDevices>({
"type": "config/device_registry/list"
}).then(
data =>
data.filter(
({ disabled_by }) => !disabled_by
).reduce<Record<string, DeviceRegistryItem>>((all, n) => {
all[n.id] = n
return all
}, {}
))
export const deviceRegistryColl = (conn: Connection) => getCollection<Record<string, DeviceRegistryItem>>(
conn,
"_$drc",
fetchDeviceRegistry
)
+8
View File
@@ -0,0 +1,8 @@
import { Connection, getCollection } from "home-assistant-js-websocket";
import { HassEntitiesRegistry } from './types';
export const fetchEntityRegistry = (conn: Connection) => conn.sendMessagePromise<HassEntitiesRegistry>({
"type": "config/entity_registry/list"
}).then(data => data.filter(({ disabled_by }) => !disabled_by))
export const entityRegistryColl = (conn: Connection) => getCollection<HassEntitiesRegistry>(conn, "_$erc", fetchEntityRegistry)
@@ -0,0 +1,27 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { Page } from "components/Page";
import { useHAConnection } from './connection';
const Test: FC = () => {
const conn = useHAConnection();
return <code>
{JSON.stringify(conn, null, 4)}
</code>
}
export default {
title: 'Services/HA Service',
component: Test,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
}
} as ComponentMeta<typeof Test>
export const Base: ComponentStory<typeof Test> = props => {
return <Page>
<Test {...props} />
</Page>
};
+101
View File
@@ -0,0 +1,101 @@
import { useState, useEffect, useRef } from 'react';
import {
ERR_HASS_HOST_REQUIRED,
createLongLivedTokenAuth,
Connection,
ERR_CANNOT_CONNECT,
ERR_CONNECTION_LOST,
ERR_INVALID_AUTH,
ERR_INVALID_HTTPS_TO_HTTP,
createConnection as _createConnection,
} from "home-assistant-js-websocket";
import { wsURL } from 'apiService';
export type HAConnection = {
status: 'loading'
} | {
status: 'loaded',
connection: Connection,
} | {
status: 'error',
error: any,
};
let haConnection: HAConnection = {
status: 'loading',
};
const translateErrorCodes = (errorCode: number) => {
if (errorCode === ERR_HASS_HOST_REQUIRED) {
return "Missing HASS host"
}
if (errorCode === ERR_CANNOT_CONNECT) {
return "Failed to connect"
}
if (errorCode === ERR_CONNECTION_LOST) {
return "Connection Lost"
}
if (errorCode === ERR_INVALID_AUTH) {
return "Invalid Host"
}
if (errorCode === ERR_INVALID_HTTPS_TO_HTTP) {
return "Invalid https to http"
}
return errorCode;
}
const createConnection = async () => {
try {
return _createConnection({
auth: createLongLivedTokenAuth(wsURL, 'xxx'),
});
} catch (error) {
// eslint-disable-next-line
throw {
originalError: JSON.stringify(error),
message: translateErrorCodes(error as any),
}
}
}
async function startHAConnection() {
let connection: Connection;
try {
connection = await createConnection();
} catch (error) {
haConnection = {
status: 'error',
error: {
originalError: JSON.stringify(error),
message: translateErrorCodes(error as any),
}
}
throw error
}
haConnection = {
status: 'loaded',
connection,
}
return haConnection;
}
startHAConnection().then(console.log).catch(console.error);
export const useHAConnection = (): HAConnection => {
const [conn, setConn] = useState<HAConnection>(haConnection);
const timeID = useRef<number | undefined>(undefined);
useEffect(() => {
if (conn.status !== haConnection.status) {
setConn(haConnection);
}
const waiter = () => {
if (conn.status !== haConnection.status) {
setConn(haConnection);
}
timeID.current = window.setTimeout(() => {
waiter()
}, conn.status === 'loading' ? 500 : 5000)
}
waiter()
return () => window.clearTimeout(timeID.current)
}, [conn, setConn])
return conn;
};
+42
View File
@@ -0,0 +1,42 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { Page } from "components/Page";
import { useHADeviceRegistry } from "haService";
import InputYaml from "components/Inputs/InputYaml";
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
const conn = useHADeviceRegistry();
onRender && onRender()
if (conn.ready) {
return <div>
{Object.keys(conn.collection.state).length} items
<ul style={{
maxHeight: '100vh',
overflow: 'auto'
}}>
{Object.keys(conn.collection.state).map(k => <li key={k}>
<b>{k}</b>
{/* <u>{conn.collection.state[k].length > 1 ? conn.collection.state[k].length : ''}</u> */}
<InputYaml value={conn.collection.state[k]} onChange={() => { }} label={k} />
</li>)}
</ul>
</div>
}
return <code>
Loading...
</code>
}
export default {
title: 'Services/Device Registry',
component: Test,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {}
} as ComponentMeta<typeof Test>
export const Base: ComponentStory<typeof Test> = props => {
return <Page>
<Test {...props} />
</Page>
};
+26
View File
@@ -0,0 +1,26 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { Page } from "components/Page";
import { useHAEntities } from "haService";
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
const conn = useHAEntities();
onRender && onRender()
return <code>
{JSON.stringify(conn, null, 4)}
</code>
}
export default {
title: 'Services/HA Entities',
component: Test,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {}
} as ComponentMeta<typeof Test>
export const Base: ComponentStory<typeof Test> = props => {
return <Page>
<Test {...props} />
</Page>
};
+45
View File
@@ -0,0 +1,45 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { Page } from "components/Page";
import { useHAEntityRegistry } from "haService";
import InputYaml from "components/Inputs/InputYaml";
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
const conn = useHAEntityRegistry();
onRender && onRender()
if (conn.ready) {
return <div>
{conn.collection.state.length}
<ul style={{
maxHeight: '100vh',
overflow: 'auto'
}}>
{conn.collection.state.map((row, i) => <li key={i}>
{/* {Object.keys(row).map(k => <>
<span key={k}>
<b>{k}</b>: {JSON.stringify(row[k] as any)}
</span><br key={`${k}-br`} />
</>)} */}
{/* <InputYaml label={String(i)} value={row} onChange={() => { }} /> */}
</li>)}
</ul>
</div>
}
return <code>
Loading...
</code>
}
export default {
title: 'Services/Entity Registry',
component: Test,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {}
} as ComponentMeta<typeof Test>
export const Base: ComponentStory<typeof Test> = props => {
return <Page>
<Test {...props} />
</Page>
};
Loaded 100 of 111 files, more files were not shown because too many files have changed in this diff. Show more