Compare commits

...
43 Commits
Author SHA1 Message Date
Ari Sosnovsky f6ca454999 Update config.yaml 2022-06-14 18:17:56 -04:00
Ari Sosnovsky cdc5aa16b0 Update CHANGELOG.md 2022-06-14 18:17:28 -04:00
ari 7b816c3fbf v1 of service editor 2022-06-14 15:06:02 -04:00
ari 0cecae5faa reloading autos 2022-06-13 19:26:55 -04:00
ari c17783064c update config 2022-06-12 22:44:16 -04:00
ari d824a93695 delay fixes 2022-06-12 22:23:30 -04:00
ari 5207c48f8d v0.1.20 2022-06-12 22:11:58 -04:00
ari b30f4ed59a enabled flag 2022-06-12 21:55:32 -04:00
ari e3a816f2c8 wait template 2022-06-12 21:39:45 -04:00
ari 240f8faef7 latest work 2022-06-12 16:42:44 -04:00
ari 651ba865b1 fixed up inputtime 2022-06-11 18:54:33 -04:00
ari a3e9d19c45 added icon for flip 2022-06-09 17:13:34 -04:00
ari 942867d646 adjusted tasks 2022-06-08 09:38:58 -04:00
ari 041c2f02d5 added tasks + timestring validation 2022-06-08 09:34:52 -04:00
ari fb30d577aa clean up 2022-06-06 22:42:08 -04:00
ari c4a90fcd1c clean up 2022-06-06 22:39:30 -04:00
ari 4c3b34195a service autocomplete 2022-06-06 22:37:34 -04:00
ari 78494ee74d fixed up some styling issues 2022-06-06 19:40:20 -04:00
ari d3fff074e5 fixed up linting 2022-06-06 17:35:35 -04:00
ari 0ee0a06737 more reliable ws 2022-06-06 17:34:06 -04:00
ari 61000f2ff1 namer in conditions 2022-06-06 11:28:51 -04:00
ari ac1ee86cc7 namer 2022-06-06 11:27:25 -04:00
ari c934a4afcb using cookies to remember where we are 2022-06-06 11:02:06 -04:00
Ari Sosnovsky 359958aada 1.1.19 2022-06-05 23:16:30 -04:00
ari 7a73af4434 initial proto of mobile mode graph 2022-06-05 20:55:44 -04:00
ari 55bb941399 some fixes for invalid nodes 2022-06-04 23:36:12 -04:00
ari afb765024d clean up on actions 2022-06-04 22:12:32 -04:00
ari 911f867518 fixed up issues with saving 2022-06-04 22:10:41 -04:00
ari 25bb19dbe5 new logo 2022-06-04 21:32:45 -04:00
ari 9960ce2909 new logo 2022-06-04 21:25:42 -04:00
ari c2fde70954 logo 2022-06-04 21:13:54 -04:00
Ari Sosnovsky 5ca9c4a361 Prepped v0.1.17 (#12)
prepped v0.1.17
2022-06-04 20:56:42 -04:00
ari c27f2d13f0 no latest for tests 2022-06-04 18:40:57 -04:00
ari 26c81effd6 fixed routing issue 2022-06-04 17:54:32 -04:00
ari e72c83b980 location fix 2022-06-04 16:09:52 -04:00
ari e222c42150 fixed typing errors 2022-06-04 15:56:15 -04:00
ari e7b88fc6f6 ensured ci passes 2022-06-04 15:50:28 -04:00
ari 079f353dbf trying to just redirect ws 2022-06-04 15:45:14 -04:00
ari e6e51be5a5 using dockerhub 2022-06-01 21:50:01 -04:00
ari 3a6b21a117 updated ignore list 2022-06-01 21:48:31 -04:00
ari f42df5a70f added build actions to ghcr.io 2022-06-01 21:22:58 -04:00
ari 0c3e9b5ace added build actions to ghcr.io 2022-06-01 21:22:44 -04:00
ari bc773154c6 all the latest socket work 2022-06-01 21:17:16 -04:00
108 changed files with 2997 additions and 916 deletions

No files matched your search

+8 -1
View File
@@ -3,4 +3,11 @@ webapp/build
webapp/.storybook
webapp/.vscode
webapp/.env.local
webapp/tmux.sh
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
-2
View File
@@ -1,6 +1,4 @@
name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
push:
+1
View File
@@ -100,5 +100,6 @@ jobs:
with:
args: |
--${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \
--target .
+27 -1
View File
@@ -1,6 +1,32 @@
# 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.21] - Service Editor
- first version of service editor
- reloading automations on save
## [0.1.20] - UI Bugfixes
- Using MUI elements for input time
- Added delay action / wait_on_triggers action
- Added enabled/disabled flag in node editor
- Optional flip vertical during desktop mode
- Fixed up modal clipping
## [0.1.19] - Vertical mobile mode
- in mobile mode we draw the graphs vertically now
## [0.1.17] - Websockets
- Connected to HA main websocket -- now we retrieve real-time information about
* Device names
* Entity names/ids
- Autocomplete for devices and entities
## [0.1.14] - Material UI + Autocomplete
- Brought some Material UI elements for input and text
- Autocomplete for tags
+1 -2
View File
@@ -9,8 +9,6 @@ WORKDIR /app
ARG BUILD_VERSION
# <--- Environment Variables -->
ENV HASSIO_TOKEN ""
ENV SUPERVISOR_TOKEN ""
ENV BUILD_VERSION $BUILD_VERSION
# <--- System Wide Dependencies -->
@@ -52,3 +50,4 @@ LABEL \
ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
-1
View File
@@ -24,7 +24,6 @@ push:
$(DC) push
start:
$(MAKE) build
$(DC) up -d
sleep 1
$(DC) ps
+4 -4
View File
@@ -2,9 +2,9 @@
[![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 | amd64-edge | i386-edge | armv7-edge | aarch64-edge | armhf-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) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-i386?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-armv7?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-aarch64?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-armhf?&sort=date&label=&style=for-the-badge) |
| | 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!
@@ -21,9 +21,9 @@ A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI
- [X] See all automations in one common view
- [X] Automation Manager
- [X] Tags for automation organization
- [X] Autocomplete fields for entities/devices
- [ ] Script Manager
- [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts
+13 -16
View File
@@ -1,17 +1,14 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
+1 -2
View File
@@ -33,7 +33,7 @@ test:
coverage:
$(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=90
$(VENV_BIN)/coverage report -m --fail-under=80
clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
@@ -43,5 +43,4 @@ clean:
run-local:
rm -f web
ln -s ../webapp/build web
cd ../webapp && yarn build
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
+10 -5
View File
@@ -3,16 +3,16 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager
from src.env import ORIGIN, ROOT_FOLDER
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping
from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI()
if (ROOT_FOLDER / "web").exists():
app.mount(
"/web",
f"{API_PREFIX}/web",
StaticFiles(
directory=ROOT_FOLDER / "web",
html=True,
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
allow_headers=["*"],
)
app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
app.include_router(
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
return app
+4 -4
View File
@@ -1,8 +1,6 @@
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.get("/")
def read_ping():
def read_details():
return {
"version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(),
+39
View File
@@ -0,0 +1,39 @@
import asyncio
import json
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
from src.logger import get_logger
from src.ws_redirect import WSRedirector
router = APIRouter()
logger = get_logger(__name__)
@router.websocket("/api/websocket")
async def websocket_endpoint(websocket: WebSocket):
async def on_message(msg: str):
await websocket.send_text(msg)
conn = WSRedirector(
on_message=on_message,
)
async def wait_for_data():
while True:
try:
msg_str = await websocket.receive_text()
msg_d = json.loads(msg_str)
if msg_d.get("type") != "auth":
await conn.send(msg_str)
except WebSocketDisconnect:
logger.info("Websocket closed.")
await conn.close()
break
await websocket.accept()
await asyncio.gather(
conn.start(),
wait_for_data(),
)
+3
View File
@@ -4,5 +4,8 @@ from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO")
API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+4
View File
@@ -14,3 +14,7 @@ else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
+59
View File
@@ -0,0 +1,59 @@
import asyncio
import json
from typing import Callable, Coroutine, Optional
from websockets.client import WebSocketClientProtocol, connect
from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import get_logger, logger
OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__)
class WSRedirector:
def __init__(
self,
on_message: OnMessage,
token: str = HASSIO_TOKEN,
host: str = HASSIO_WS,
) -> None:
self._host = host
self._token = token
self._on_message = on_message
self._client: Optional[WebSocketClientProtocol] = None
self._close: bool = False
@property
def is_closed(self):
return self._close
async def send(self, msg: str):
if self._client:
return await self._client.send(msg)
async def start(self):
async with connect(self._host) as websocket:
self._client = websocket
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
while not self.is_closed:
try:
msg = await websocket.recv()
# logger.debug(f"HA MSG :--> {msg} {self.is_closed}")
await self.process_message(msg)
except ConnectionClosedOK:
pass
logger.info("Closing socket...")
await websocket.close()
logger.info("Closed socket")
async def process_message(self, msg: str):
await self._on_message(msg)
async def close(self):
self._close = True
await self._client.close()
def __del__(self):
asyncio.create_task(self.close())
+29
View File
@@ -0,0 +1,29 @@
import os
import yaml
from pathlib import Path
print(Path().absolute())
CONFIG_YAML = Path("config.yaml").absolute()
CHANGELOG_MD = Path("CHANGELOG.md").absolute()
print(CONFIG_YAML)
print(CHANGELOG_MD)
version = os.environ["VERSION"]
version_name = os.environ["NAME"]
change = os.environ["CHANGELOG"].splitlines()
config = yaml.load(CONFIG_YAML.read_text(), yaml.Loader)
changelog = CHANGELOG_MD.read_text().splitlines()
with CHANGELOG_MD.open("w") as fp:
for i, log in enumerate(changelog):
if i == 2:
fp.write(f"## [{version}] - {version_name}\n\n")
for clog in change:
fp.write(f"- {clog.strip()}\n")
fp.write(log.strip() + "\n")
CONFIG_YAML.write_text(yaml.dump(config))
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation
version: v0.1.14
version: v0.1.21
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
+3
View File
@@ -3,5 +3,8 @@ services:
addon:
volumes:
- "./sample_config:/config"
- "./api/tests:/app/tests"
ports:
- "8000:8000"
env_file:
- api/.env
-2
View File
@@ -5,8 +5,6 @@ api_location=${1}
pushd $api_location
echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION
echo "HASSIO_TOKEN = "$HASSIO_TOKEN
echo "SUPERVISOR_TOKEN = "$SUPERVISOR_TOKEN
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.
+59
View File
@@ -0,0 +1,59 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "tsc",
"problemMatcher": [],
"label": "npm: tsc",
"detail": "tsc -w",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test"
},
{
"type": "npm",
"script": "test",
"problemMatcher": [],
"label": "npm: test",
"detail": "test",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test",
},
{
"type": "npm",
"script": "storybook",
"problemMatcher": [],
"label": "npm: storybook",
"detail": "start-storybook -p 6006 -s public",
"promptOnClose": true
},
{
"type": "npm",
"script": "build",
"problemMatcher": [],
"label": "npm: build",
"detail": "react-scripts build",
"group": "build"
},
{
"type": "npm",
"script": "start",
"problemMatcher": [],
"label": "npm: start",
"detail": "react-scripts start",
"promptOnClose": true
},
]
}
+6 -1
View File
@@ -6,20 +6,24 @@
"dependencies": {
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@mui/icons-material": "^5.8.3",
"@mui/material": "^5.8.0",
"@mui/styles": "^5.8.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.36",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.5",
"@types/ws": "^8.5.3",
"@uiw/react-codemirror": "^4.7.0",
"autosuggest-highlight": "^3.2.1",
"home-assistant-js-websocket": "^7.1.0",
"jss": "^10.8.2",
"notistack": "^2.0.5",
"react": "^18.1.0",
"react-cookie": "^4.1.1",
"react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2",
"react-imask": "^6.4.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"react-scripts": "5.0.1",
@@ -27,6 +31,7 @@
"theming": "^3.3.0",
"typescript": "^4.1.2",
"web-vitals": "^2.1.4",
"ws": "^8.7.0",
"yarn": "^1.22.17"
},
"scripts": {
@@ -94,4 +99,4 @@
"node_modules",
"src"
]
}
}
+8 -5
View File
@@ -3,6 +3,7 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary';
import { CookiesProvider } from "react-cookie";
function App() {
const api = useConnectedApiService();
@@ -10,11 +11,13 @@ function App() {
return (
<div className="app">
<ErrorBoundary>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
<CookiesProvider>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
</CookiesProvider>
</ErrorBoundary>
</div>
);
+6 -3
View File
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
data = {}
}) {
try {
const reply = await fetch(baseURL + path, {
const payload: RequestInit = {
method,
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify(data),
});
};
if (method !== 'GET') {
payload["body"] = JSON.stringify(data);
}
const reply = await fetch(baseURL + path, payload);
let response: APIResponse<any>;
if (reply.status === 200) {
response = {
+11 -7
View File
@@ -4,14 +4,18 @@ import { makeRemoteAPI } from "./base";
import { useAPIService } from './core';
import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
`http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI(
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
makeAutomationAPI(remoteAutoAPI)
);
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos))
+1 -1
View File
@@ -7,7 +7,7 @@ export interface ListParams {
}
export type APIRequest<D> = {
path: string;
method?: "POST" | "DELETE",
method?: "POST" | "DELETE" | "GET",
data?: D;
};
+3 -3
View File
@@ -5,7 +5,7 @@ import { AutomationAPI } from './automations';
export const useDefaultApiState = () => useState<ApiState>({
automations: {ready: false},
automations: { ready: false },
});
export const makeReloadAutomations = (
@@ -21,8 +21,8 @@ export const makeReloadAutomations = (
const resp = await automationAPI.list(params);
setState({
...state, automations: {
ready: true,
...resp,
ready: true,
...resp,
}
});
}
@@ -103,7 +103,7 @@ export const AutoInfoBox: FC<Props> = ({
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
<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
value={tagName}
label="Name"
@@ -28,13 +28,9 @@
.automation-editor--flow-wrapper--toolbar {
display: flex;
flex-direction: row;
gap: 0.25em;
justify-content: flex-end;
}
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
margin-top: 0.25em;
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
@@ -1,6 +1,7 @@
import "./index.css";
import Icon from '@mui/material/Icon';
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react";
import { FC, useEffect, useState } from "react";
import { AutomationData } from "types/automations";
import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons";
@@ -37,8 +38,16 @@ export const AutomationEditor: FC<Props> = ({
save,
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [closeInfo, setCloseInfo] = useState(false);
const [flipped, setFlipped] = useState(dims.flipped);
// effect
useEffect(() => {
if (dims.flipped !== flipped) {
setFlipped(dims.flipped)
}
// eslint-disable-next-line
}, [dims.flipped])
// render
if (state.status === 'loading') {
@@ -75,6 +84,13 @@ export const AutomationEditor: FC<Props> = ({
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar">
{!dims.flipped && <Button
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
onClick={() => setFlipped(!flipped)}
>
<Icon>{flipped ? 'flip_to_front' : 'flip_to_back'}</Icon>
Flip
</Button>}
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
@@ -91,7 +107,10 @@ export const AutomationEditor: FC<Props> = ({
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
dims={dims}
dims={{
...dims,
flipped,
}}
/>
</div>
</div>
@@ -3,6 +3,7 @@ import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie";
export default {
title: 'App/AutomationList/Box',
@@ -16,10 +17,12 @@ export default {
const Template: ComponentStory<typeof AutomationListBox> = args => {
const [selected, setSelected] = useState(args.selected)
return <Page>
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
<CookiesProvider>
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
</CookiesProvider>
</Page>
}
@@ -6,6 +6,7 @@ import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button";
import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie";
export type Props = {
@@ -16,6 +17,39 @@ export type Props = {
onAdd: () => void;
}
const useAutomationListBoxState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_
] = useCookies(['albSearchText', 'albSelected']);
let initialSelected = [];
try {
initialSelected = JSON.parse(cookies.albSelected)
if (!Array.isArray(initialSelected)) {
initialSelected = [initialSelected]
}
initialSelected = initialSelected.map(Number)
// eslint-disable-next-line
} catch (_) { }
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>(initialSelected);
return {
searchText,
setSearchText(v: string) {
setSearchText(v)
setCookies('albSearchText', v)
},
setSelectedTagIdx(n: number[]) {
setSelectedTagIdx(n)
setCookies('albSelected', JSON.stringify(n))
},
selectedTagIdx,
}
}
export const AutomationListBox: FC<Props> = ({
automations,
selected,
@@ -25,9 +59,13 @@ export const AutomationListBox: FC<Props> = ({
}) => {
const tags = getTagList(automations);
const [searchText, setSearchText] = useState('');
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
const {
searchText,
setSearchText,
selectedTagIdx,
setSelectedTagIdx,
} = useAutomationListBoxState();
const filteredAutomations = filterAutomations(automations, searchText.toLowerCase(), selectedTagIdx, tags);
const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map(i => tags[i]),
@@ -67,4 +67,12 @@
top: 0.75em;
background-color: var(--green-opaque);
z-index: 30;
}
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
}
+45 -5
View File
@@ -13,6 +13,8 @@ import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress";
import { useCookies } from 'react-cookie';
import { useHA } from "haService";
interface AutomationListParams {
@@ -24,6 +26,32 @@ interface AutomationListParams {
children?: ReactNode;
}
export const useAutomationListState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_
] = useCookies(['alCurrent']);
let initialCurrent = 0;
try {
initialCurrent = Number(cookies.alCurrent ?? '0');
} catch (_) { }
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(initialCurrent);
return {
hideList,
setHideList,
current,
setCurrent(i: number) {
setCurrent(i)
setCookies('alCurrent', String(i))
}
}
}
export const AutomationList: FC<AutomationListParams> = ({
automations,
onUpdate,
@@ -33,8 +61,7 @@ export const AutomationList: FC<AutomationListParams> = ({
children,
}) => {
// state
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(0);
const { hideList, setHideList, current, setCurrent } = useAutomationListState();
const { isMobile } = useWindowSize();
// alias
const currentAuto = automations.length > 0 ? automations[current] : null;
@@ -67,7 +94,10 @@ export const AutomationList: FC<AutomationListParams> = ({
{currentAuto ? <AutomationEditor
automation={currentAuto}
onUpdate={a => onUpdate(current, a)}
dims={dims}
dims={{
...dims,
flipped: isMobile
}}
tagDB={tagDB}
/> : <></>}
</div>
@@ -84,11 +114,21 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
state: {
automations,
},
removeAutomation,
updateAutomation,
...methods
},
dims
}) => {
const { reloadAutomations } = useHA();
const removeAutomation = async (args: any) => {
const resp = await methods.removeAutomation(args)
await reloadAutomations();
return resp
}
const updateAutomation = async (args: any) => {
const resp = await methods.updateAutomation(args)
await reloadAutomations();
return resp
}
if (!automations.ready) {
return <div className="automation-list--root loading">
<LinearProgress />
@@ -9,6 +9,7 @@ import { getEditor } from "./editorRender";
import { useStyles } from "./style";
import { getViewer } from "./viewRender";
import useWindowSize from "utils/useWindowSize";
import { useHA } from "haService";
@@ -33,6 +34,7 @@ export const ConditionNode: FC<{
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false);
const { isMobile } = useWindowSize();
const { namer } = useHA();
// alias
const effectiveDM = internalDisplayMode || yamlMode;
// effect
@@ -64,7 +66,7 @@ export const ConditionNode: FC<{
let childrenConditions: JSX.Element;
if (effectiveDM) {
const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
childrenConditions = <Viewer condition={condition} onChange={onUpdate} namer={namer} />
} else {
const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
@@ -5,7 +5,7 @@ import InputText from "components/Inputs/InputText";
import { InputEntity } from "components/Inputs/InputEntities";
import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater";
import InputTime from "components/Inputs/InputTime";
import { InputTime } from "components/Inputs/InputTime";
import InputYaml from "components/Inputs/InputYaml";
@@ -1,12 +1,13 @@
import { FC } from "react";
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
import { getDescriptionFromAutomationNode } from "utils/formatting";
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater";
interface Viewer<C extends AutomationCondition> extends FC<{
condition: C;
namer: Namer;
onChange: (condition: C) => void;
}> { }
@@ -23,9 +24,10 @@ export const getViewer = (condition: AutomationCondition): Viewer<any> => {
export const GenericViewer: Viewer<AutomationCondition> = ({
condition,
namer,
}) => {
return <>
{getDescriptionFromAutomationNode(condition)}
{getDescriptionFromAutomationNode(condition, namer)}
</>
}
+4 -2
View File
@@ -12,6 +12,7 @@ export interface DAGCircleProps {
backgroundColor?: string;
disableSource?: boolean;
disableTarget?: boolean;
flipped: boolean;
}
export const makeFlowCircle = (
circleId: string,
@@ -32,6 +33,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor,
disableSource = false,
disableTarget = false,
flipped,
}
}) => {
const { classes } = useCircleStyles({
@@ -41,8 +43,8 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor,
});
return <>
{!disableSource && <Handle type="source" position={Position.Right} />}
{!disableTarget && <Handle type="target" position={Position.Left} />}
{!disableSource && <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />}
{!disableTarget && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<div className={classes.root}>
{
onAdd ?
@@ -3,21 +3,21 @@ import { Handle, Position } from 'react-flow-renderer';
import { FC } from 'react';
import { InfoIcon, PencilIcon } from 'components/Icons';
export interface DAGErrorNodeProps {
height: number;
width: number;
flipped: boolean;
hasInput?: boolean;
error?: any,
onEdit: () => void;
}
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
height, width, hasInput, error, onEdit
height, width, hasInput, error, onEdit, flipped
}) => {
// render
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
<Handle type="source" position={Position.Right} />
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={["dagnode-error"].join(' ')} style={{
height,
width,
+4 -2
View File
@@ -14,6 +14,7 @@ export interface DAGNodeProps {
label: string;
hasInput?: boolean;
accentBackground?: boolean;
flipped: boolean;
}
export const DAGNode: FC<DAGNodeProps> = ({
label,
@@ -24,6 +25,7 @@ export const DAGNode: FC<DAGNodeProps> = ({
color,
hasInput = false,
accentBackground = false,
flipped,
}) => {
const { classes, theme } = useNodeStyles({
color,
@@ -32,8 +34,8 @@ export const DAGNode: FC<DAGNodeProps> = ({
accentBackground,
});
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
<Handle type="source" position={Position.Right} />
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={classes.root}>
<div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}>
@@ -19,4 +19,5 @@ export const DEFAULT_DIMS = {
x: PADDING,
y: PADDING,
},
flipped: false,
} as DAGAutomationFlowDims
+9 -10
View File
@@ -1,19 +1,22 @@
import { makeFlowCircle } from "./DAGCircle"
import { DAGCircleProps, makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims } from "./types"
import { XYPosition } from 'react-flow-renderer';
import { Node, XYPosition } from 'react-flow-renderer';
import { DAGNodeProps } from "./DAGNode";
export const makeAddButton = (
id: string,
position: XYPosition,
{
circleSize,
flipped,
}: DAGAutomationFlowDims,
onAdd: () => void,
disableTarget: boolean = true,
) => makeFlowCircle(
): Node<DAGCircleProps> => makeFlowCircle(
id,
position,
{
flipped,
size: circleSize,
onAdd,
disableSource: true,
@@ -25,22 +28,17 @@ export const makeConditionPoint = (
id: string,
position: XYPosition,
{
padding,
conditionWidth,
conditionHeight,
nodeWidth,
nodeHeight,
circleSize,
distanceFactor,
flipped,
}: DAGAutomationFlowDims,
totalConditions: number,
onEditClick: () => void,
) => ({
): Node<DAGNodeProps> => ({
id,
type: 'dagnode',
position,
data: {
size: circleSize,
color: 'lblue',
accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
@@ -48,5 +46,6 @@ export const makeConditionPoint = (
width: conditionWidth,
hasInput: true,
onEditClick,
flipped,
}
})
@@ -92,7 +92,10 @@ Complex.args = {
{
"platform": "homeassistant",
"event": "start",
}
},
{
"bad": "node"
} as any
],
sequence: [
{
@@ -120,6 +123,9 @@ Complex.args = {
"media_content_type": "SPOTIFY"
}
},
{
"alias": "Bad Node",
},
{
"choose": [
{
@@ -231,4 +237,27 @@ Errors.args = {
"choose": {}
} as any
]
}
export const ComplexFlipped = Complex.bind({})
ComplexFlipped.args = {
...Complex.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
export const SimpleFlipped = Simple.bind({})
SimpleFlipped.args = {
...Simple.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
+27 -4
View File
@@ -16,6 +16,7 @@ import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods";
import { convertToFlowNode } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode";
import { useHA } from "haService";
const nodeTypes = {
'dagnode': convertToFlowNode(DAGNode),
@@ -57,7 +58,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
}) => {
// state
const [modalState, setModalState] = useState<ModalState | null>(null);
const { namer, } = useHA();
// modal
let modalBody = <></>
if (modalState) {
@@ -66,7 +67,10 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
node={modalState.node}
isErrored={modalState.isError}
onClose={() => setModalState(null)}
onSave={n => { modalState.update(n as any); setModalState(null); }}
onSave={n => {
modalState.update(n as any);
setModalState(null);
}}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
@@ -81,7 +85,11 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
}
// 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,
y: dims.padding.y + dims.nodeHeight * 0.25
}, dims, condition.length, makeOnEditAutomationConditions(
@@ -94,6 +102,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
edges: [],
}
triggerToFlow(flowData, trigger, condPoint.id, dims, {
namer,
onAdd: () => onTriggerUpdate([
...trigger, {
platform: 'event',
@@ -120,13 +129,27 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
sequence,
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,
y: dims.padding.y,
}
},
namer,
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
);
// this fixes some strange edge drawing issue
flowData.edges = flowData.edges.map(e => ({
...e,
"source": `${e.source}-${dims.flipped}`,
"target": `${e.target}-${dims.flipped}`,
}))
flowData.nodes = flowData.nodes.map(n => ({
...n,
id: `${n.id}-${dims.flipped}`
}))
// render
return <>
<Modal open={!!modalState}>
@@ -1,6 +1,6 @@
import { AutomationSequenceNode } from 'types/automations';
import { DAGAutomationFlowDims, FlowData } from './types';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
import { getDescriptionFromAutomationNode, Namer } from 'utils/formatting';
import { XYPosition } from 'react-flow-renderer';
import { ChooseAction } from 'types/automations/actions';
import { makeFlowCircle } from './DAGCircle';
@@ -14,6 +14,7 @@ export const sequenceToFlow = (
sequence: AutomationSequenceNode[],
fromPoint: string,
dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater,
prefix: string = "",
) => {
@@ -25,12 +26,18 @@ export const sequenceToFlow = (
const nodeId = `${prefix}n-${i}`;
let position: XYPosition;
if (lasPos) {
position = {
position = dims.flipped ? {
y: lasPos.y + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x
} : {
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y
}
} else {
position = {
position = dims.flipped ? {
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor * (i + 2),
x: dims.padding.x
} : {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
y: dims.padding.y
};
@@ -39,7 +46,7 @@ export const sequenceToFlow = (
if (getNodeType(node) === 'action') {
if ('choose' in node) {
try {
const out = addChooseNode(node, position, nodeId, dims, updater, i);
const out = addChooseNode(node, position, nodeId, dims, namer, updater, i);
position = out.lastPos
flowData = mergeFlowDatas(flowData, out.flowData);
} catch (err) {
@@ -49,13 +56,15 @@ export const sequenceToFlow = (
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i)
onXClick: () => updater.removeNode(i),
namer,
});
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i)
onXClick: () => updater.removeNode(i),
namer,
});
}
@@ -67,7 +76,14 @@ export const sequenceToFlow = (
// add button
const addCircle = makeAddButton(
`${prefix}-+`,
{
dims.flipped ? {
y: (
lasPos === null ?
dims.padding.y + dims.nodeHeight * dims.distanceFactor * (sequence.length + 1) :
lasPos.y
) + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x + dims.circleSize * 1.5
} : {
x: (
lasPos === null ?
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
@@ -104,22 +120,25 @@ const addSingleNode = (
position: XYPosition,
nodeId: string,
{
flipped,
nodeHeight,
nodeWidth,
}: DAGAutomationFlowDims,
opts: {
onEditClick: () => void;
onXClick: () => void;
namer: Namer;
}
) => flowData.nodes.push({
id: nodeId,
type: 'dagnode',
data: {
label: getDescriptionFromAutomationNode(node),
label: getDescriptionFromAutomationNode(node, opts.namer),
height: nodeHeight,
width: nodeWidth,
color: getNodeType(node) === 'action' ? 'green' : 'blue',
hasInput: true,
flipped,
...opts,
},
position,
@@ -156,6 +175,7 @@ const addChooseNode = (
position: XYPosition,
nodeId: string,
dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater,
i: number,
) => {
@@ -166,16 +186,21 @@ const addChooseNode = (
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
let lastPos: XYPosition = position;
// conditions
node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`;
// edit/delete circle
const circle = makeFlowCircle(`${sequenceId}>delete`, {
const circle = makeFlowCircle(`${sequenceId}>delete`, dims.flipped ? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
} : {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, {
flipped: dims.flipped,
size: dims.circleSize,
onRemove: createOnRemoveForChooseNode(
node,
@@ -187,7 +212,10 @@ const addChooseNode = (
addEdge(flowData, nodeId, circle.id, true)
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
{
dims.flipped ? {
y: circle.position.y + dims.circleSize * dims.distanceFactor,
x: circle.position.x - dims.circleSize,
} : {
x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8,
},
@@ -201,15 +229,24 @@ const addChooseNode = (
// actual sub sequence
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
...dims,
padding: {
padding: dims.flipped ? {
y: condNode.position.y - dims.nodeHeight * dims.distanceFactor,
x: condNode.position.x - dims.conditionHeight / 2,
} : {
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2,
},
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
}, namer, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else {
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
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;
@@ -217,7 +254,10 @@ const addChooseNode = (
// add button
const addCirlce = makeAddButton(
`${nodeId}>add`,
{
dims.flipped ? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
} : {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
@@ -238,19 +278,25 @@ const addChooseNode = (
addEdge(flowData, nodeId, addCirlce.id, true)
// 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,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
}, { size: dims.circleSize })
}, { size: dims.circleSize, flipped: dims.flipped })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
...dims,
padding: {
padding: dims.flipped ? {
y: position.y,
x: elseCircle.position.x - 1.4 * dims.circleSize,
} : {
x: position.x - dims.nodeWidth,
y: elseCircle.position.y - dims.circleSize / 4,
},
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
}, namer, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else {
@@ -16,6 +16,8 @@ export const triggerToFlow = (
nodeWidth,
padding,
conditionHeight,
circleSize,
flipped,
} = dims;
// convert all triggers to dag nodes
trigger.forEach((t, i) => {
@@ -24,14 +26,21 @@ export const triggerToFlow = (
id: flowId,
type: 'dagnode',
data: {
label: getDescriptionFromAutomationNode(t),
label: getDescriptionFromAutomationNode(t, opts.namer),
height: nodeHeight,
width: nodeWidth,
flipped,
color: 'red',
onEditClick: () => opts.onEdit(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({
id: `e(${flowId})-(${toPoint})`,
@@ -43,7 +52,10 @@ export const triggerToFlow = (
// create a 'add button'
flowData.nodes.push(makeAddButton(
'trigger-add',
{
flipped ? {
y: padding.y + circleSize / 4,
x: padding.x + nodeWidth * distanceFactor * trigger.length,
} : {
x: padding.x + nodeWidth * 0.4,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
},
+3
View File
@@ -5,6 +5,7 @@ import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
import { DAGErrorNodeProps } from './DAGErrorNode';
import { Namer } from 'utils/formatting';
export type DAGAutomationFlowDims = {
@@ -15,6 +16,7 @@ export type DAGAutomationFlowDims = {
conditionHeight: number;
circleSize: number;
distanceFactor: number;
flipped: boolean;
}
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
@@ -27,6 +29,7 @@ export type TriggerMakerOptions = {
onAdd: () => void,
onEdit: (i: number) => void,
onDelete: (i: number) => void,
namer: Namer,
}
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
+13 -9
View File
@@ -27,19 +27,23 @@ export const makeSequenceUpdater = (
choose: [],
default: [],
},
update: n => onChange([
...sequence,
n,
]),
update: n => {
onChange([
...sequence,
n,
])
},
allowedTypes: ['action', 'condition']
})
},
updateNode(i: number, node: AutomationSequenceNode) {
return onChange([
...sequence.slice(0, i),
node,
...sequence.slice(i + 1),
])
if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
return onChange([
...sequence.slice(0, i),
node,
...sequence.slice(i + 1),
])
}
},
updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction;
@@ -1,26 +1,26 @@
.input-entities .BaseBadge-root {
.input-autocomplete .BaseBadge-root {
max-width: 100%;
}
.input-entities--chip>span {
.input-autocomplete--chip>span {
display: flex;
flex-direction: row;
gap: 0.15em;
}
.input-entities--chip>span>small::before {
.input-autocomplete--chip>span>small::before {
content: "/ ";
}
.input-entities--chip>span>small {
.input-autocomplete--chip>span>small {
size: 0.15em;
}
.input-entities--errors {
.input-autocomplete--errors {
margin-top: 0.75em;
}
.input-entities--errors ul {
.input-autocomplete--errors ul {
padding: 0 0 0 1em;
margin: 0;
max-height: 2.5em;
@@ -28,7 +28,7 @@
overflow-x: hidden;
}
.input-entities--tags {
.input-autocomplete--tags {
max-height: 5em;
max-width: 100%;
overflow: auto;
@@ -0,0 +1,204 @@
import "./InputAutoComplete.css";
import { Option } from "haService";
import Autocomplete from "@mui/material/Autocomplete";
import TextField from "@mui/material/TextField";
import Chip from "@mui/material/Chip";
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
export type InputAutoCompleteProps<T extends Option<any>> = {
className?: string;
validateOption?: (v: string[]) => string[] | null;
groupBy?: (opt: T) => string;
options: T[];
getLabel?: (opt: T) => string;
getID?: (opt: T) => string;
helperText?: string;
} & InputAutoCompletePropsBase;
export type InputAutoCompletePropsBase = {
label?: string;
} & (
| {
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
}
| {
value: string | string[];
multiple: true;
onChange: (v: string[]) => void;
}
);
export function InputAutoComplete<T extends Option>(
props: InputAutoCompleteProps<T>
) {
// aliases
const getID = (opt: T): string => {
if (props.getID) {
return props.getID(opt);
}
if (typeof opt === "string") {
return opt;
}
return opt.id;
};
const getLabel = (opt: T): string => {
if (props.getLabel) {
return props.getLabel(opt);
}
if (typeof opt === "string") {
return opt;
}
return opt.label;
};
// processing of inputs
const value = Array.isArray(props.value)
? props.value
: !!props.value
? [props.value]
: [];
const errors = props.validateOption ? props.validateOption(value) : null;
const options = props.options.sort((a, b) => {
return getID(a) > getID(b) ? 1 : -1;
});
// processing of errors
let helperText = props.helperText ?? <></>;
let error: boolean = false;
if (errors !== null) {
error = true;
if (errors.length > 0) {
helperText = (
<Badge
className="input-autocomplete--errors"
badgeContent={errors.length}
color="error"
>
<ul title={errors.join(", and")}>
{errors.map((msg, i) => (
<li key={i}>{msg}</li>
))}
</ul>
</Badge>
);
}
}
// events
const onChange = (_e: any, v: any) => {
const cleanValue: string[] =
v === null
? []
: Array.isArray(v)
? v.map((opt) => {
if (typeof opt === "string") {
return opt;
}
return opt.id;
})
: [v];
if (props.multiple) {
props.onChange(cleanValue);
} else {
props.onChange(cleanValue[cleanValue.length - 1]);
}
};
return (
<Autocomplete
className={["input-autocomplete", props.className ?? ""].join(" ")}
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={getLabel as any}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase().trim();
if (!searchTerm) {
return opts;
}
return opts
.map((opt) => {
let similarityScore = 0;
const eid = getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length);
}
const name = getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length);
}
return {
label: name,
id: eid,
domain: typeof opt === "string" ? "" : (opt as any).domain,
similarityScore,
};
})
.filter((opt) => opt.similarityScore > 0)
.sort((a, b) => {
return a.similarityScore > b.similarityScore ? 1 : -1;
}) as any;
}}
groupBy={props.groupBy}
renderOption={(listProps, option, { inputValue }) => {
const label = getLabel(option);
const id = getID(option);
return (
<SearchItem
key={label + id}
listProps={listProps}
id={id}
label={label}
searchTerm={inputValue}
/>
);
}}
renderInput={(params) => (
<TextField
{...params}
variant="filled"
label={props.label ?? "Entity ID"}
helperText={helperText}
error={error}
/>
)}
renderTags={(tagValue, getTagProps) => {
const inner = (
<div className="input-autocomplete--tags">
{tagValue.map((option, index) => {
const label = getLabel(option);
const id = getID(option);
const tagProps = getTagProps({ index });
tagProps.className += " input-autocomplete--chip";
return (
<Chip
size="medium"
label={
<>
{id === label ? <span>{label}</span> : <b>{label}</b>}
{id !== label && <small>{id}</small>}
</>
}
{...tagProps}
/>
);
})}
</div>
);
if (props.multiple) {
return (
<Badge badgeContent={tagValue.length} color="info">
{inner}
</Badge>
);
} else {
return inner;
}
}}
/>
);
}
@@ -7,14 +7,16 @@ export interface Props {
value: boolean;
onChange: (v: boolean) => void;
disabled?: boolean;
className?: string;
}
export default function InputBoolean({
label,
value = false,
onChange,
disabled = false,
className,
}: Props) {
return <FormGroup>
return <FormGroup className={className}>
<FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} />
</FormGroup>
}
@@ -0,0 +1,148 @@
import "./InputTime.css";
import { useState, useEffect, FC } from "react";
import TextField from '@mui/material/TextField';
import EditIcon from '@mui/icons-material/Edit';
import CloseIcon from "@mui/icons-material/Close";
import IconButton from "@mui/material/IconButton"
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { convertAutomationTimeToTimeObject, convertObjectToAutomationTimeString, milisecondsToObject } from "utils/time";
import { convertStringToAutomationTimeObject, convertAutomationTimeToTimeString } from 'utils/time';
import { prettyName } from "utils/formatting";
import FormControl from "@mui/material/FormControl";
import InputLabel from '@mui/material/InputLabel';
import Input from "@mui/material/Input";
import FormHelperText from '@mui/material/FormHelperText';
// constants
const fields: Array<keyof AutomationTimeObject> = [
'hours',
'minutes',
'seconds',
'milliseconds'
]
export interface Props {
label: string;
value?: AutomationTime;
onChange: (v?: AutomationTimeObject) => void;
}
export const InputTime: FC<Props> = (props) => {
// state
const [disabled, setDisabled] = useState(!props.value)
const [displayValue, setDisplayValue] = useState(convertAutomationTimeToTimeObject(props.value))
// process display input
const updateOne = (k: keyof AutomationTimeObject) => (v: string) => {
if (Number(v) < 0) {
setDisplayValue({
...displayValue,
[k]: 0
})
} else if (k === "hours") {
setDisplayValue({
...displayValue,
[k]: Number(v)
})
} else if (k === "minutes") {
let minutes = Number(v);
let { hours = 0 } = displayValue
if (minutes > 59) {
const additonalHours = Math.floor(minutes / 60)
hours += additonalHours
minutes = minutes - additonalHours * 60
}
setDisplayValue({
...displayValue,
minutes,
hours,
})
} else if (k === "seconds") {
let seconds = Number(v);
let { hours = 0, minutes = 0 } = displayValue
if (seconds > 59) {
const additonalHours = Math.floor(seconds / (60 * 60))
hours += additonalHours
seconds = seconds - additonalHours * 60
}
if (seconds > 59) {
const additionalMinutes = Math.floor(seconds / 60)
minutes += additionalMinutes
seconds = seconds - additionalMinutes * 60
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
})
} else if (k === "milliseconds") {
let milliseconds = Number(v);
let { hours = 0, minutes = 0, seconds = 0 } = displayValue
if (milliseconds > 1000) {
const additonalHours = Math.floor(milliseconds / (60 * 60 * 1000))
hours += additonalHours
milliseconds = milliseconds - additonalHours * 60 * 60 * 1000
}
if (milliseconds > 1000) {
const additionalMinutes = Math.floor(milliseconds / (60 * 1000))
minutes += additionalMinutes
milliseconds = milliseconds - additionalMinutes * 60 * 1000
}
if (milliseconds > 1000) {
const additionalSeconds = Math.floor(milliseconds / 1000)
seconds += additionalSeconds
milliseconds = milliseconds - additionalSeconds * 1000
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
milliseconds,
})
}
}
// effect
useEffect(() => {
if (disabled && !props.value) {
return
}
if (disabled) {
props.onChange(undefined)
} else {
const pVal = convertAutomationTimeToTimeString(props.value);
const cVal = convertObjectToAutomationTimeString(displayValue);
if (pVal !== cVal) {
props.onChange(displayValue)
}
}
}, [disabled, displayValue])
return <div className="input-time">
<InputLabel >{props.label}</InputLabel>
<div className="input-time--inner">
{fields.map(name =>
<TextField
key={name}
variant="filled"
label={prettyName(name)}
defaultValue="00"
InputProps={{
disabled,
type: "number",
title: prettyName(name),
}}
value={displayValue[name] ?? 0}
onChange={e => updateOne(name)(e.target.value)}
/>
)}
<IconButton onClick={() => setDisabled(!disabled)}>
{disabled ? <EditIcon /> : <CloseIcon />}
</IconButton>
</div>
</div>
}
@@ -32,5 +32,5 @@ export const Single = Template.bind({})
Single.args = {
...Single.args,
multiple: false,
value: 'sensor.bathroom'
value: 'sensor.humidity_bathroom'
} as any
+9 -108
View File
@@ -1,117 +1,18 @@
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';
import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
export type InputEntityProps = {
label?: string,
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: EntityId;
multiple: true;
onChange: (v: string[]) => void;
})
export type InputDeviceProps = InputAutoCompletePropsBase & { multiple?: false };
export const InputDevice: FC<InputEntityProps> = props => {
export const InputDevice: FC<InputDeviceProps> = 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>
}
return <InputAutoComplete
{...props}
label={props.label ?? "Device ID"}
getID={dr.getID}
getLabel={dr.getLabel}
options={dr.getOptions()}
/>
}
+9 -125
View File
@@ -1,138 +1,22 @@
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 { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
import { prettyName } from "utils/formatting";
import { EntityId } from 'types/automations/common';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
export type InputEntityProps = {
export type InputEntityProps = InputAutoCompletePropsBase & {
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
})
}}
return <InputAutoComplete
{...props}
validateOption={v => entities.validateOptions(v, props.restrictToDomain)}
options={entities.getOptions(props.restrictToDomain)}
getID={entities.getID}
getLabel={entities.getLabel}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
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>
}
/>
}
+58 -36
View File
@@ -1,52 +1,74 @@
import { FC } from "react";
import FormHelperText from '@mui/material/FormHelperText';
import InputLabel from '@mui/material/InputLabel';
import MenuItem from '@mui/material/MenuItem';
import FormControl from '@mui/material/FormControl';
import Select from '@mui/material/Select';
import FormHelperText from "@mui/material/FormHelperText";
import InputLabel from "@mui/material/InputLabel";
import MenuItem from "@mui/material/MenuItem";
import FormControl from "@mui/material/FormControl";
import Select from "@mui/material/Select";
import { prettyName } from "utils/formatting";
import { ReactNode } from "react";
export interface Props<T extends string> {
current: T;
export type Props<T extends string | Object> = {
current?: T;
options: readonly T[];
onChange: (n: T) => void;
label: string;
id?: string;
className?: string;
}
export const InputList: FC<Props<any>> = ({
prettyOptionLabels?: boolean;
getKey?: (n: T) => string;
placeholder?: any;
title?: string;
helperText?: string;
endAdornment?: ReactNode;
};
export function InputList<T extends string | Object>({
current,
options,
onChange,
label,
id,
className,
}) => {
const invalidCurrent = current && !options.includes(current);
return <FormControl variant="filled" sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}>
<InputLabel id="demo-simple-select-filled-label">{label}</InputLabel>
<Select
prettyOptionLabels,
getKey = String,
placeholder,
title,
helperText,
endAdornment,
}: Props<T>) {
const invalidCurrent =
current && !options.map(getKey).includes(getKey(current));
return (
<FormControl
className={className}
autoWidth
id={id}
value={current}
onChange={(e) => {
onChange(e.target.value)
}}
label={label}
variant="filled"
placeholder={label}
error={invalidCurrent}
sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}
>
{options.map((t, i) => (
<MenuItem
key={i}
value={t}
>
{t}
</MenuItem>
))}
</Select>
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
</FormControl>
<InputLabel>{label}</InputLabel>
<Select
title={title}
placeholder={placeholder ?? label}
endAdornment={endAdornment}
autoWidth
id={id}
value={current ? getKey(current) : ""}
onChange={(e) => {
const key = e.target.value;
const option = options.filter((opt) => getKey(opt) === key)[0];
onChange(option);
}}
label={label}
variant="filled"
error={invalidCurrent}
fullWidth
>
{options.map((t, i) => (
<MenuItem key={i} value={getKey(t)}>
{prettyOptionLabels ? prettyName(getKey(t)) : getKey(t)}
</MenuItem>
))}
</Select>
<FormHelperText variant="filled" error={invalidCurrent}>
{invalidCurrent ? `'${current}' is not a valid selection` : helperText}
</FormHelperText>
</FormControl>
);
}
+46 -28
View File
@@ -1,43 +1,61 @@
import InputWrapper from "./InputWrapper";
import { useInputNumberStyles } from "./styles";
import Close from "@mui/icons-material/Close";
import TextField from "@mui/material/TextField";
import IconButton from "@mui/material/IconButton";
import InputAdornment from "@mui/material/InputAdornment";
import Edit from "@mui/icons-material/Edit";
export interface Props {
label: string;
label: string | JSX.Element;
value: number | undefined;
onChange: (v: number | undefined) => void;
className?: string;
min?: number,
max?: number,
step?: number,
min?: number;
max?: number;
step?: number;
unit?: string;
placeholder?: any;
required?: boolean;
}
export default function InputNumber({
label,
value = undefined,
onChange,
className = "",
min, max, step,
min,
max,
step,
unit,
placeholder,
required,
}: Props) {
const { classes } = useInputNumberStyles({});
return <InputWrapper className={className} label={label} labelSize={value !== undefined ? 'small' : 'normal'}>
<input
className={classes.input}
type="number"
value={value ?? ""}
onChange={e => {
e.preventDefault();
let v = Number(e.target.value);
if (max) {
v = Math.min(v, max)
}
if (min) {
v = Math.max(v, min)
}
onChange(v)
const disabled = value === undefined || value === null;
return (
<TextField
variant="filled"
label={label}
value={value}
defaultValue={value}
onChange={(e) => onChange(Number(e.target.value ?? 0))}
disabled={disabled}
className={className}
placeholder={placeholder}
required={required}
InputProps={{
endAdornment: (
<InputAdornment position="end">
{unit}
<IconButton onClick={() => onChange(disabled ? 0 : undefined)}>
{disabled ? <Edit /> : <Close />}
</IconButton>
</InputAdornment>
),
inputProps: {
min,
max,
type: "number",
step,
},
}}
step={step}
min={min}
max={max}
/>
{value && <button className={classes.deleteIcon} onClick={() => onChange(undefined)}>X</button>}
</InputWrapper>
);
}
@@ -0,0 +1,36 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { InputService } from "./InputService";
export default {
title: 'Inputs/InputService',
component: InputService,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof InputService>;
const Template: ComponentStory<typeof InputService> = args => {
const [value, setValue] = useState(args.value)
return <Page>
<div style={{
maxWidth: 200
}}>
<InputService {...args} value={value as any} onChange={(v: any) => {
setValue(v)
args.onChange(v as any)
}} />
</div>
</Page>
}
export const Single = Template.bind({})
Single.args = {
...Single.args,
multiple: false,
value: ''
} as any
@@ -0,0 +1,19 @@
import { FC } from "react";
import { useHAServices } from 'haService';
import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
import { prettyName } from 'utils/formatting';
export type InputServiceProps = InputAutoCompletePropsBase & { multiple?: false };
export const InputService: FC<InputServiceProps> = props => {
const services = useHAServices();
return <InputAutoComplete
{...props}
label={props.label ?? "Service"}
options={services.getOptions()}
getID={services.getID}
getLabel={services.getLabel}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
/>
}
+65 -36
View File
@@ -1,60 +1,89 @@
import { PropsWithChildren, useState } from "react";
import React, { PropsWithChildren, ReactNode, useState } from "react";
import { useToolTip } from "tooltip/context";
import TextField from '@mui/material/TextField';
import TextField from "@mui/material/TextField";
import InputWrapper from "./InputWrapper";
export interface Props {
textBoxFor?: string;
label: string;
label: string | JSX.Element;
value: string;
onChange: (v: string) => void;
onEnter?: () => void;
additionalTooltipFilters?: Record<string, string>;
multiline?: boolean;
maxRows?: number;
className?: string;
placeholder?: any;
title?: string;
helperText?: string;
endAdornment?: ReactNode;
required?: boolean;
}
export default function InputText({
label,
title,
helperText,
textBoxFor,
value = "",
onChange,
onEnter = () => { },
endAdornment,
onEnter = () => {},
additionalTooltipFilters = {},
multiline = false,
maxRows = 4,
children,
className,
placeholder,
required,
}: PropsWithChildren<Props>) {
const tooltip = useToolTip();
const [isFocused, setIsFocused] = useState(false)
return <InputWrapper label="">
<TextField multiline={multiline} maxRows={maxRows} fullWidth inputMode="text" variant="filled" focused={isFocused} label={label} value={value}
onKeyDown={e => {
if (e.key === 'Enter') {
onEnter();
}
}}
onChange={e => {
e.preventDefault();
onChange(e.target.value)
}}
onBlur={() => {
setIsFocused(false)
}}
onFocus={e => {
setIsFocused(true)
if (textBoxFor) {
tooltip.setFocus(
e.target.getBoundingClientRect(),
{
searchObject: textBoxFor,
searchText: value,
filterObjects: additionalTooltipFilters,
},
onChange
)
}
}}
/>
{children}
</InputWrapper>
const [isFocused, setIsFocused] = useState(false);
return (
<InputWrapper className={className} label="">
<TextField
multiline={multiline}
maxRows={maxRows}
fullWidth
inputMode="text"
variant="filled"
focused={isFocused}
label={label}
value={value}
title={title}
helperText={helperText}
placeholder={placeholder}
InputProps={{
endAdornment,
}}
required={required}
onKeyDown={(e) => {
if (e.key === "Enter") {
onEnter();
}
}}
onChange={(e) => {
e.preventDefault();
onChange(e.target.value);
}}
onBlur={() => {
setIsFocused(false);
}}
onFocus={(e) => {
setIsFocused(true);
if (textBoxFor) {
tooltip.setFocus(
e.target.getBoundingClientRect(),
{
searchObject: textBoxFor,
searchText: value,
filterObjects: additionalTooltipFilters,
},
onChange
);
}
}}
/>
{children}
</InputWrapper>
);
}
@@ -0,0 +1,9 @@
.input-time>.input-time--inner {
display: flex;
gap: 0;
flex-direction: row;
}
.input-time>.input-time--inner>.MuiFormControl-root {
width: 4em;
}
@@ -3,7 +3,7 @@ import { Page } from "components/Page";
import { useState } from "react";
import { AutomationTime } from "types/automations/common";
import InputTime from "./InputTime";
import { InputTime } from "./InputTime";
export default {
title: 'Inputs/InputTime',
@@ -16,11 +16,19 @@ const Template: ComponentStory<typeof InputTime> = args => {
const [value, setValue] = useState<AutomationTime | undefined>(undefined);
return <Page>
<InputTime {...args} value={value} onChange={setValue} />
<div style={{
padding: '1em'
}}>
<InputTime {...args} value={value} onChange={t => {
setValue(t)
args.onChange(t)
}} />
</div>
</Page>
}
export const SimpleText = Template.bind({})
SimpleText.args = {
label: "Time Stamp",
value: "10"
}
+135 -50
View File
@@ -1,60 +1,145 @@
import { PropsWithChildren, useState } from "react";
import "./InputTime.css";
import { useState, useEffect, FC } from "react";
import TextField from '@mui/material/TextField';
import EditIcon from '@mui/icons-material/Edit';
import CloseIcon from "@mui/icons-material/Close";
import IconButton from "@mui/material/IconButton"
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { milisecondsToObject } from "utils/time";
import InputWrapper from "./InputWrapper";
import { useInputTimeStyles } from "./styles";
import { convertStringToAutomationTimeObject } from 'utils/time';
import { convertAutomationTimeToTimeObject, convertObjectToAutomationTimeString, convertAutomationTimeToTimeString } from 'utils/time';
import { prettyName } from "utils/formatting";
// constants
const fields: Array<keyof AutomationTimeObject> = [
'hours',
'minutes',
'seconds',
'milliseconds'
]
export interface Props {
textBoxFor?: string;
label: string;
value?: AutomationTime;
onChange: (v?: AutomationTimeObject) => void;
onEnter?: () => void;
className?: string;
}
export default function InputTime({
label,
textBoxFor,
value = {},
onChange,
onEnter = () => { },
children,
}: PropsWithChildren<Props>) {
let cleanValue = '';
if (value) {
if (typeof value === 'string') {
value = convertStringToAutomationTimeObject(value);
export const InputTime: FC<Props> = (props) => {
// state
const [disabled, setDisabled] = useState(!props.value)
const [displayValue, setDisplayValue] = useState(convertAutomationTimeToTimeObject(props.value))
// process display input
const updateOne = (k: keyof AutomationTimeObject) => (v: string) => {
if (Number(v) < 0) {
setDisplayValue({
...displayValue,
[k]: 0
})
} else if (k === "hours") {
setDisplayValue({
...displayValue,
[k]: Number(v)
})
} else if (k === "minutes") {
let minutes = Number(v);
let { hours = 0 } = displayValue
if (minutes > 59) {
const additonalHours = Math.floor(minutes / 60)
hours += additonalHours
minutes = minutes - additonalHours * 60
}
setDisplayValue({
...displayValue,
minutes,
hours,
})
} else if (k === "seconds") {
let seconds = Number(v);
let { hours = 0, minutes = 0 } = displayValue
if (seconds > 59) {
const additonalHours = Math.floor(seconds / (60 * 60))
hours += additonalHours
seconds = seconds - additonalHours * 60
}
if (seconds > 59) {
const additionalMinutes = Math.floor(seconds / 60)
minutes += additionalMinutes
seconds = seconds - additionalMinutes * 60
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
})
} else if (k === "milliseconds") {
let milliseconds = Number(v);
let { hours = 0, minutes = 0, seconds = 0 } = displayValue
if (milliseconds > 1000) {
const additonalHours = Math.floor(milliseconds / (60 * 60 * 1000))
hours += additonalHours
milliseconds = milliseconds - additonalHours * 60 * 60 * 1000
}
if (milliseconds > 1000) {
const additionalMinutes = Math.floor(milliseconds / (60 * 1000))
minutes += additionalMinutes
milliseconds = milliseconds - additionalMinutes * 60 * 1000
}
if (milliseconds > 1000) {
const additionalSeconds = Math.floor(milliseconds / 1000)
seconds += additionalSeconds
milliseconds = milliseconds - additionalSeconds * 1000
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
milliseconds,
})
}
const {
hours = 0,
minutes = 0,
seconds = 0,
milliseconds = 0,
} = value;
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
}
const { classes } = useInputTimeStyles({});
const [isFocused, setIsFocused] = useState(false)
return <InputWrapper className={classes.wrapper} label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
<input
className={classes.input}
type="time"
step={0.001}
value={cleanValue}
onKeyDown={e => {
if (e.key === 'Enter') {
onEnter();
}
}}
onChange={e => {
e.preventDefault();
onChange(milisecondsToObject(e.target.valueAsNumber))
}}
onBlur={e => {
setIsFocused(false)
}}
/>
<button onClick={() => onChange()} className={classes.cancel}>X</button>
{children}
</InputWrapper>
// effect
useEffect(() => {
if (disabled && !props.value) {
return
}
if (disabled) {
props.onChange(undefined)
} else {
const pVal = convertAutomationTimeToTimeString(props.value);
const cVal = convertObjectToAutomationTimeString(displayValue);
if (pVal !== cVal) {
props.onChange(displayValue)
}
}
// eslint-disable-next-line
}, [disabled, displayValue])
return <div className={["input-time", props.className ?? ""].join(" ")}>
{/* <InputLabel >{props.label}</InputLabel> */}
<div className="input-time--inner">
{fields.map(name =>
<TextField
key={name}
variant="filled"
label={prettyName(name)}
defaultValue="00"
InputProps={{
disabled,
type: "number",
title: prettyName(name),
}}
value={displayValue[name] ?? 0}
onChange={e => updateOne(name)(e.target.value)}
/>
)}
<IconButton onClick={() => setDisabled(!disabled)}>
{disabled ? <EditIcon /> : <CloseIcon />}
</IconButton>
</div>
</div>
}
@@ -7,7 +7,7 @@ export interface Props {
labelSize?: 'normal' | 'small';
noMargin?: boolean;
className?: string;
error?: string;
error?: JSX.Element | string;
children: ReactNode;
}
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
+15 -5
View File
@@ -1,5 +1,5 @@
import * as yaml from "js-yaml";
import { useState } from "react";
import { useEffect, useState } from "react";
import { useDelayEffect } from 'utils/useDelay';
import CodeMirror from '@uiw/react-codemirror';
@@ -10,18 +10,22 @@ export interface Props<T extends {}> {
label: string;
value: T;
onChange: (v: T) => void;
error?: JSX.Element | string,
className?: string;
}
export default function InputYaml<T>({
export default function InputYaml<T extends {}>({
label,
error: incmError,
value = {} as any,
onChange,
className,
}: Props<T>) {
const [{ text, error }, setState] = useState<{
text: string,
error: undefined | string,
error: undefined | JSX.Element | string,
}>({
text: yaml.dump(value),
error: undefined
error: incmError,
});
const setText = (t: string) => {
try {
@@ -31,6 +35,12 @@ export default function InputYaml<T>({
setState({ text: t, error: "! Invalid Yaml !" })
}
}
useEffect(() => {
setState({
text: yaml.dump(value),
error: incmError,
})
}, [value, incmError])
useDelayEffect(() => {
if (!error && (yaml.dump(value) !== text)) {
if (text) {
@@ -42,7 +52,7 @@ export default function InputYaml<T>({
}
}
}, [text], 1000)
return <InputWrapper label={label} error={error}>
return <InputWrapper className={className} label={label} error={error}>
<CodeMirror
theme={"dark"}
value={text}
+5 -5
View File
@@ -13,7 +13,7 @@ const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
justifyContent: 'center',
alignItems: 'center',
zIndex: open ? 10 : -1,
position: 'absolute',
position: 'fixed',
height: '100vh',
width: '100vw',
top: 0,
@@ -30,10 +30,10 @@ const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
},
inner: {
zIndex: 10,
maxWidth: '80%',
maxHeight: '90%',
minHeight: 'fit-content',
minWidth: 'fit-content',
maxWidth: '80vw',
maxHeight: '90vh',
minHeight: 'min-content',
minWidth: '100px',
padding: '15px',
display: 'flex',
flexDirection: 'column',
@@ -33,4 +33,16 @@
.multinode-editor.modded .multinode-editor--total {
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>;
// branch
if (state.isEmpty) {
return <div className='column center' style={{
return <div className={["multinode-editor", state.isModified ? "modded" : '', isMobile ? 'mobile' : ''].join(' ')} style={{
minWidth: '20vw',
}}>
<div style={{
flex: 1,
display: 'flex',
justifyContent: 'center',
alignItems: 'flex-start',
}}>
<div className="multinode-editor--navbar">
{nextOrAddBtn}
</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.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>
}
@@ -107,9 +107,9 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
slides.slice(slide + 1)
),
multiNode: {
isModified: multiNode.isModified,
isModified: true,
isSaved: false,
}
},
})
},
onSave(node: AutomationNode) {
@@ -129,6 +129,17 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
internalNodeModified: false,
})
},
onSaveEmpty() {
justSaved.current = true
setState({
...state,
multiNode: {
isModified: multiNode.isModified,
isSaved: true,
},
internalNodeModified: false,
})
},
onClose() {
if (!multiNode.isSaved && multiNode.isModified) {
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)
}
if (justSaved.current) {
props.onSave && props.onSave(slides)
}
props.onClose && props.onClose()
}
}
@@ -1,8 +1,7 @@
import InputText from "components/Inputs/InputText";
import InputYaml from 'components/Inputs/InputYaml';
import { InputService } from "components/Inputs/InputService";
import { ServiceEditor } from "components/ServiceEditor";
import { ServiceAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager';
import { OptionManager, updateActionData } from "./OptionManager";
export const ActionCallServiceState: OptionManager<ServiceAction> = {
defaultState: () => ({
@@ -10,31 +9,34 @@ export const ActionCallServiceState: OptionManager<ServiceAction> = {
target: {},
data: {},
}),
isReady: ({
service,
}) => (
service !== ''
),
renderOptionList: (state, setState) => {
isReady: ({ service }) => service !== "",
Component: ({ state, setState, services }) => {
const { service, target, data } = state;
const update = updateActionData(state, setState);
return <>
<InputText
textBoxFor="service"
label="Service"
value={service}
onChange={service => update({ service })}
/>
<InputYaml
label="Target"
value={target}
onChange={target => update({ target })}
/>
<InputYaml
label="Data"
value={data}
onChange={data => update({ data })}
/>
</>
}
}
const serviceOption = services.getOption(service);
return (
<>
<InputService
value={service}
onChange={(service: string | null) =>
update({ service: service ?? "" })
}
/>
{serviceOption && (
<ServiceEditor
key={service}
serviceId={service}
service={serviceOption}
data={{ target, field: data }}
onUpdate={({ target, field }) =>
update({
target,
data: field,
})
}
/>
)}
</>
);
},
};
@@ -0,0 +1,33 @@
.node-editor--action-wait {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.node-editor--action-wait .for {
flex: 2;
}
.node-editor--action-wait .for .input-time--inner {
justify-content: center;
}
.node-editor--action-wait .template {
margin: 0;
flex: 2;
}
.node-editor--action-wait .triggers {
width: 100%;
}
.node-editor--action-wait .wait-type {
flex: 1;
}
.node-editor--action-wait .wait-options {
width: 100%;
display: flex;
justify-content: space-evenly;
align-items: center;
}
@@ -1,41 +1,109 @@
import "./ActionWait.css";
import InputBoolean from "components/Inputs/InputBoolean";
import { InputList } from "components/Inputs/InputList";
import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText";
import { WaitAction } from "types/automations/actions";
import { InputTime } from "components/Inputs/InputTime";
import { useState } from "react";
import { DelayAction, WaitAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager';
import InputYaml from "components/Inputs/InputYaml";
type ThisAction = WaitAction | DelayAction;
type Option = 'delay' | 'template' | 'trigger'
const getCurrentOption = (node: ThisAction): Option => {
if ('delay' in node) {
return 'delay'
} else {
return 'template'
}
}
export const ActionWaitState: OptionManager<WaitAction> = {
export const ActionWaitState: OptionManager<ThisAction> = {
defaultState: () => ({
alias: "Wait",
wait_template: "",
// timeout: 0,
continue_on_timeout: false,
delay: "",
}),
isReady: ({
alias, wait_template
}) => (
alias !== '' &&
wait_template !== ""
),
renderOptionList: (state, setState) => {
isReady: () => true,
Component: ({ state, setState }) => {
// state
const update = updateActionData(state, setState);
return <>
<InputText
textBoxFor="template"
label="Template"
value={state.wait_template}
onChange={wait_template => update({ wait_template })}
/>
{/* <InputNumber
label="Timeout"
value={state.timeout ?? 0}
onChange={(timeout = 0) => update({ timeout })}
/> */}
<InputBoolean
label="Continue on Timeout"
value={state.continue_on_timeout ?? false}
onChange={continue_on_timeout => update({ continue_on_timeout })}
/>
</>
const [current, _setCurrent] = useState(getCurrentOption(state));
const setCurrent = (opt: Option) => {
const base: any = {
alias: state.alias,
variables: state.variables,
}
if (opt === 'delay') {
setState({
...base,
delay: (state as any).delay ?? "",
})
} else {
base.timeout = (state as any).timeout
base.continue_on_timeout = (state as any).continue_on_timeout
if (opt === 'template') {
setState({
...base,
wait_template: (state as any).wait_template ?? "",
})
} else {
setState({
...base,
wait_for_trigger: (state as any).wait_for_trigger ?? "",
})
}
}
_setCurrent(opt)
}
// determine options
let option: JSX.Element = <></>;
if (current === "delay") {
option = <>
<InputTime className="for" label="for" value={(state as any).delay} onChange={delay => update({ delay })} />
</>
} else if (current === 'template') {
state = state as WaitAction;
option = <>
<InputText
label="Template"
className="template"
value={state.wait_template ?? ""}
onChange={wait_template => update({ wait_template })}
/>
</>
} else if (current === 'trigger') {
state = state as WaitAction;
option = <>
<InputYaml
className="triggers"
label="Triggers"
value={state.wait_for_trigger ?? []}
onChange={wait_for_trigger => update({ wait_for_trigger })}
/>
</>
}
// render
return <div className="node-editor--action-wait">
<InputList
className="wait-type"
label="Wait Type" prettyOptionLabels
options={["template", 'trigger', "delay"]}
current={current} onChange={setCurrent} />
{option}
{current !== 'delay' ? <div className="wait-options">
<InputNumber
label="Timeout"
value={(state as any).timeout ? Number((state as any).timeout) : undefined}
onChange={timeout => update({ timeout: timeout === undefined ? undefined : String(timeout) })}
/>
<InputBoolean
label="Continue on Timeout"
value={(state as any).continue_on_timeout ?? false}
onChange={continue_on_timeout => update({ continue_on_timeout })}
/>
</div> : <></>}
</div>
}
}
@@ -1,29 +1,47 @@
import { HAEntitiesState } from 'haService';
import { HAEntitiesState, HAServicesState } from 'haService';
import { FC } from 'react';
import { AutomationAction } from 'types/automations/actions';
import { AutomationCondition } from 'types/automations/conditions';
export interface OptionManager<T> {
export type OptionManager<T> = {
defaultState(): T;
isReady(s: T): boolean;
} & ({
renderOptionList(s: T, set: (s: T) => void, entities: HAEntitiesState): JSX.Element;
}
} | {
Component: FC<{
state: T,
setState: (s: T) => void,
entities: HAEntitiesState,
services: HAServicesState,
}>
})
export const cleanUpUndefined = (data: Record<string, any>): any => {
const clean: any = {};
Object.keys(data).forEach(k => {
if ((data[k] !== undefined) && (data[k] !== null)) {
clean[k] = data[k]
}
})
return clean;
}
export const updateConditionData = <T extends AutomationCondition>(
setState: (s: T) => void
) => (
state: T,
data: Partial<T>,
) => setState({
...state,
...data,
})
) => setState(cleanUpUndefined({
...state,
...data,
}))
export const updateActionData = <T extends AutomationAction>(
state: T,
setState: (s: T) => void
) => (
data: Partial<T>,
) => setState({
...state,
...data,
})
) => setState(cleanUpUndefined({
...state,
...data,
}))
@@ -3,8 +3,7 @@ import { AutomationTriggerNumericState } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputEntities';
import InputNumber from 'components/Inputs/InputNumber';
import InputTime from 'components/Inputs/InputTime';
import InputYaml from 'components/Inputs/InputYaml';
import { InputTime } from 'components/Inputs/InputTime'; import InputYaml from 'components/Inputs/InputYaml';
export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> = {
@@ -2,7 +2,7 @@ import { OptionManager } from './OptionManager';
import { AutomationTriggerState } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputEntities';
import InputTime from 'components/Inputs/InputTime';
import { InputTime } from 'components/Inputs/InputTime';
export const TriggerState: OptionManager<AutomationTriggerState> = {
@@ -1,7 +1,7 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerTemplate } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import InputTime from 'components/Inputs/InputTime';
import { InputTime } from 'components/Inputs/InputTime';
export const TriggerTemplate: OptionManager<AutomationTriggerTemplate> = {
@@ -1,6 +1,6 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerTime } from 'types/automations/triggers';
import InputTime from 'components/Inputs/InputTime';
import { InputTime } from 'components/Inputs/InputTime';
import { convertObjectToAutomationTimeString } from 'utils/time';
@@ -40,6 +40,8 @@ export const getOptionManager = <T extends AutomationNodeTypes>(
return ActionCallServiceState;
case "wait":
return ActionWaitState;
case "delay":
return ActionWaitState;
}
}
if (nodeType === 'condition') {
@@ -1,43 +1,62 @@
import { Dispatch, SetStateAction, useEffect, useState } from 'react';
import { AutomationNode, AutomationNodeTypes } from 'types/automations';
import { AutomationNodeSubtype } from 'types/automations';
import { getOptionManager } from './getOptionManager';
import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations';
import InputYaml from 'components/Inputs/InputYaml';
import InputText from 'components/Inputs/InputText';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
import { useHAEntities } from 'haService';
import { Dispatch, SetStateAction, useEffect, useState } from "react";
import { AutomationNode, AutomationNodeTypes } from "types/automations";
import { AutomationNodeSubtype } from "types/automations";
import { getOptionManager } from "./getOptionManager";
import {
getNodeSubType,
getSubTypeList,
validateNode,
} from "utils/automations";
import InputYaml from "components/Inputs/InputYaml";
import InputText from "components/Inputs/InputText";
import { getDescriptionFromAutomationNode } from "utils/formatting";
import { useHA } 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({
yamlMode: false,
isModified: false,
...computeInvalidYaml(originalNode)
...computeInvalidYaml(originalNode, allowedTypes),
});
const entities = useHAEntities();
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
const { entities, namer, services } = useHA();
// aliases
const {
node: currentNode,
isModified,
yamlMode,
invalidManualYaml,
} = allState;
// effects
useEffect(() => {
setAllState({ ...allState, node: originalNode, isModified: false, })
setAllState({ ...allState, node: originalNode, isModified: false });
// eslint-disable-next-line
}, [originalNode])
const setState = (node: AutomationNode) => setAllState(({
...allState, node,
isModified: JSON.stringify(node) !== JSON.stringify(originalNode),
}));
const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, });
}, [originalNode]);
// function aliases
const setState = (node: AutomationNode) =>
setAllState({
...allState,
node,
isModified: JSON.stringify(node) !== JSON.stringify(originalNode),
});
const setYamlMode = (yamlMode: boolean) =>
setAllState({ ...allState, yamlMode });
const setStateForManualYaml = (yaml: any) => {
try {
createData(yaml, yaml)
setAllState({
...allState,
...computeInvalidYaml(yaml)
})
} catch (err) {
setAllState({ ...allState, invalidManualYaml: <>{String(err)}</>, isErrored: true, })
}
}
setAllState({
...allState,
...computeInvalidYaml(yaml, allowedTypes),
});
};
// value aliases
const {
originalNodeType,
originalNodeSubType,
@@ -45,7 +64,8 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
subType,
subTypes,
optionManager,
} = createData(originalNode, currentNode);
} = createData(originalNode, currentNode, allowedTypes);
// publuc
return {
nodeType,
subType,
@@ -54,79 +74,142 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
invalidManualYaml,
isModified,
isErrored: allState.isErrored,
get prettyNodeType() {
if (nodeType) {
return `${nodeType.slice(0, 1).toUpperCase()}${nodeType.slice(1)} Type`;
} else {
return "n/a";
}
},
get yamlMode() {
return allState.isErrored || yamlMode
return allState.isErrored || yamlMode;
},
get data() {
return currentNode
return currentNode;
},
setEnabled(enabled: boolean) {
setState({
...currentNode,
enabled,
});
},
renderOptionList() {
let aliasEditor = <></>
if (nodeType === 'trigger') {
aliasEditor = <InputText
label="Trigger ID"
value={(allState.node as any).id}
onChange={id => setState({
...allState.node,
id
} as any)}
/>
let aliasEditor = <></>;
if (nodeType === "trigger") {
aliasEditor = (
<InputText
key="alias"
label="Trigger ID"
value={(allState.node as any).id}
onChange={(id) =>
setState({
...allState.node,
id,
} as any)
}
/>
);
}
if (nodeType === 'action') {
aliasEditor = <InputText
label="Alias"
value={getDescriptionFromAutomationNode(allState.node)}
onChange={alias => setState({
...allState.node,
alias
} as any)}
/>
if (nodeType === "action") {
aliasEditor = (
<InputText
key="alias"
label="Alias"
value={getDescriptionFromAutomationNode(allState.node, namer)}
onChange={(alias) =>
setState({
...allState.node,
alias,
} as any)
}
/>
);
}
if (yamlMode || allState.isErrored) {
return <>
{aliasEditor}
<InputYaml
label=''
value={currentNode}
onChange={setStateForManualYaml}
/>
<div className="node-editor--error">{invalidManualYaml}</div>
</>
return (
<>
{aliasEditor}
<InputYaml
label=""
value={currentNode}
onChange={setStateForManualYaml}
error={invalidManualYaml}
/>
</>
);
}
return <>
{aliasEditor}
{optionManager.renderOptionList(currentNode, setState, entities)}
</>;
return (
<>
{aliasEditor}
{"renderOptionList" in optionManager ? (
optionManager.renderOptionList(currentNode, setState, entities)
) : (
<optionManager.Component
state={currentNode}
setState={setState}
entities={entities}
services={services}
/>
)}
</>
);
},
isReady() {
return optionManager.isReady(currentNode);
},
setNodeType(newType: AutomationNodeTypes) {
if (newType === originalNodeType) {
setState(originalNode)
setState(originalNode);
} else {
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) {
setState(originalNode)
setState(originalNode);
} 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,
allowedTypes: AutomationNodeTypes[]
) => {
let originalNodeType: AutomationNodeTypes = allowedTypes[0];
let originalNodeSubType: AutomationNodeSubtype | null = null;
let nodeType: AutomationNodeTypes = originalNodeType;
let subType: AutomationNodeSubtype | null = originalNodeSubType;
let subTypes: AutomationNodeSubtype[] = getSubTypeList(allowedTypes[0]);
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)}`);
}
}
const createData = (originalNode: AutomationNode, currentNode: AutomationNode) => {
const originalNodeType = getNodeType(originalNode);
const originalNodeSubType = getNodeSubType(originalNode);
const nodeType = getNodeType(currentNode);
const subType = getNodeSubType(currentNode);
const subTypes = getSubTypeList(nodeType)
const optionManager = getOptionManager(nodeType, subType as any);
return {
originalNodeType,
originalNodeSubType,
@@ -134,26 +217,34 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode) =
subType,
subTypes,
optionManager,
}
}
};
};
const computeInvalidYaml = (node: AutomationNode) => {
const errors = validateNode(node);
const computeInvalidYaml = (
node: AutomationNode,
allowedNodeTypes: AutomationNodeTypes[]
) => {
const errors = validateNode(node, allowedNodeTypes);
if (errors) {
console.log({ errors });
return {
node,
isErrored: true,
invalidManualYaml: <ul key={'error'}>
{errors.map(({ message, path }, i) => <li key={i}>
<b>{path}</b>: {message}
</li>)}
</ul>
}
invalidManualYaml: (
<ul key={"error"} className="node-editor--error">
{errors.map(({ message, path }, i) => (
<li key={i}>
<b>{path}</b>: {message}
</li>
))}
</ul>
),
};
} else {
return {
node,
isErrored: false,
invalidManualYaml: <></>
}
invalidManualYaml: <></>,
};
}
}
};
@@ -8,6 +8,14 @@
margin-top: 0.5em;
}
.node-editor--root.disabled {
background-color: var(--secondary);
}
.node-editor--root.disabled .enabled-flag {
color: var(--secondary-accent);
}
.node-editor--root.modded {
border: 1px solid var(--change);
border-radius: 5px;
@@ -58,4 +66,25 @@
max-width: 30em;
overflow: auto;
max-height: 10em;
display: flex;
flex-direction: column;
align-items: flex-start;
padding: 0 0.5em 0 1.5em;
margin: 0;
}
.node-editor--error>li {
text-align: left;
}
.node-editor--body-flags {
padding-left: 1em;
display: flex;
flex-direction: column;
justify-content: space-evenly;
}
.node-editor--body-flags .MuiCheckbox-root {
margin: 0;
padding: 0 0 0 0;
}
@@ -84,3 +84,23 @@ export const InAModal: ComponentStory<typeof NodeEditor> = props => {
</Modal>
</Page>
};
export const ServiceExample = Action.bind({})
ServiceExample.args = {
...ServiceExample.args,
node: {
"target": {},
"data": {},
"service": "",
},
}
export const DelayExample = Action.bind({})
DelayExample.args = {
...DelayExample.args,
node: {
"wait_template": "",
},
}
+13 -9
View File
@@ -29,7 +29,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
isErrored = false,
}) => {
// state
const state = useEditorNodeState(node, isErrored);
const state = useEditorNodeState(node, isErrored, allowedTypes);
// alias
const isModified = state.isModified;
@@ -43,7 +43,12 @@ export const NodeEditor: FC<NodeEditorProps> = ({
// events
onFlags(isReady, isModified);
// render
return <div className={["node-editor--root", isModified ? "modded" : "", (!isReady && isModified) ? 'not-ready' : ''].join(" ")}>
return <div className={[
"node-editor--root",
isModified ? "modded" : "",
(!isReady && isModified) ? 'not-ready' : '',
state.data.enabled === false ? 'disabled' : 'enabled'
].join(" ")}>
<div className="node-editor--body">
<div className="node-editor--body-title">
{allowedTypes.length > 1 ? <InputList
@@ -53,12 +58,15 @@ export const NodeEditor: FC<NodeEditorProps> = ({
onChange={state.setNodeType}
/> : <></>}
{state.nodeType !== 'condition' ? <InputList
label={`${state.nodeType.slice(0, 1).toUpperCase()}${state.nodeType.slice(1)} Type`}
label={state.prettyNodeType}
current={state.subType as any}
options={state.subTypes}
onChange={state.setSubType}
/> : <></>}
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} disabled={state.isErrored} />
<div className="node-editor--body-flags">
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} disabled={state.isErrored} />
<InputBoolean className="enabled-flag" label='Enabled' value={state.data.enabled ?? true} onChange={state.setEnabled} />
</div>
</div>
{state.renderOptionList()}
</div>
@@ -68,11 +76,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
className="node-editor--footer--save"
onClick={() => {
if (areYouSureNotReady('save')) {
if (JSON.stringify(state.data) !== JSON.stringify(node)) {
onSave(state.data)
} else {
onClose()
}
onSave(state.data)
}
}}
title={
+4 -1
View File
@@ -40,8 +40,11 @@ export const InternalPage: FC<{
if (snackbarKeyHAConKey.current) {
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
}
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Connected to HA!`, {
"variant": "success",
})
}
}, [conn.status])
}, [conn, snackbar])
return <main className="page" style={{
color: theme.palette.text.primary,
@@ -0,0 +1,5 @@
.service-editor--field {
display: flex;
flex-direction: row;
align-items: center;
}
@@ -0,0 +1,77 @@
import "./ServiceEditorField.css";
import { FC } from "react";
import { ServiceEditorOption } from "./options";
import InputText from "components/Inputs/InputText";
import InputNumber from "components/Inputs/InputNumber";
import { IconButton } from "@mui/material";
import { RemoveCircle } from "@mui/icons-material";
export type ServiceEditorFieldProps = {
option: ServiceEditorOption;
value: any;
onChange: (v: any) => void;
onRemove?: () => void;
};
export const ServiceEditorField: FC<ServiceEditorFieldProps> = ({
option,
value,
onChange,
onRemove,
}) => {
const description = option.data.description ?? "";
const isRequired = !onRemove;
const label = option.label;
let example = "";
const removeIcon = !onRemove ? (
<></>
) : (
<IconButton className="service-editor--field--remove" onClick={onRemove}>
<RemoveCircle />
</IconButton>
);
let input = (
<InputText
className="service-editor--field"
label={label}
value={value}
onChange={onChange}
endAdornment={removeIcon}
required={isRequired}
/>
);
if (option.type === "field") {
example = option.data.example ? `Example: ${option.data.example}` : "";
if (option.data.selector?.number) {
return (
<InputNumber
className="service-editor--field"
label={label}
value={value ?? option.data.default}
min={option.data.selector.number.min}
max={option.data.selector.number.max}
step={option.data.selector.number.step}
unit={option.data.selector.number.unit_of_measurement}
onChange={onChange}
required={isRequired}
placeholder={example}
/>
);
}
return (
<InputText
className="service-editor--field"
label={label}
title={description}
helperText={description}
value={value ?? option.data.default}
onChange={onChange}
placeholder={example}
required={isRequired}
endAdornment={removeIcon}
/>
);
}
return input;
};
@@ -0,0 +1,31 @@
.service-editor {
display: flex;
flex-direction: column;
}
.service-editor h4 {
margin: 0;
padding: 0;
}
.service-editor--name {
display: flex;
flex-direction: column;
}
.service-editor--name span {
font-size: 0.75em;
text-overflow: clip;
margin-left: 0.25em;
}
.service-editor--add {
flex: 1;
display: flex;
flex-direction: row;
align-items: center;
}
.service-editor--add--list {
flex: 1;
}
@@ -0,0 +1,44 @@
import React, { FC, useEffect, useState } from "react";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { ServiceEditor } from ".";
import { TypedHassService } from "haService/fieldTypes";
export default {
title: "Services/ServiceEditor",
component: ServiceEditor,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {},
} as ComponentMeta<typeof ServiceEditor>;
const Template: ComponentStory<typeof ServiceEditor> = (props) => {
return (
<Page>
<ServiceEditor {...props} />
<code>{JSON.stringify(props.service)}</code>
</Page>
);
};
const makeExample = (service: TypedHassService) => {
const Eg = Template.bind({});
Eg.args = {
...Eg,
service,
};
return Eg;
};
export const NumberSetValue = makeExample({
name: "Set",
description: "Set the value of a Number entity.",
fields: {
value: {
name: "Value",
description: "The target value the entity should be set to.",
example: 42,
selector: { text: null },
},
},
target: { entity: { domain: "number" } },
});
@@ -0,0 +1,184 @@
import "./index.css";
import { InputList } from "components/Inputs/InputList";
import { cleanUpUndefined } from "components/NodeEditor/OptionManager/OptionManager";
import { TypedHassService } from "haService/fieldTypes";
import { FC, useState } from "react";
import {
ServiceEditorOption,
splitUpOptions,
convertFieldToOption,
convertTargetToOption,
} from "./options";
import { ServiceEditorField } from "./ServiceEditorField";
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
export type ServiceEditorData = {
field: Record<string, any>;
target: Record<string, any>;
};
export type ServiceEditorProps = {
serviceId: string;
service: TypedHassService;
data: ServiceEditorData;
onUpdate: (d: ServiceEditorData) => void;
};
export const ServiceEditor: FC<ServiceEditorProps> = ({
serviceId,
service,
data,
onUpdate,
}) => {
const options = splitUpOptions(service);
const [additionalFields, setAdditionalFields] = useState<{
field: string[];
target: string[];
optionalList: ServiceEditorOption[];
}>({
field: [],
target: [],
optionalList: options.additional,
});
// aliases
const hasRequired = options.required.length > 0;
const hasOptional =
additionalFields.field.length + additionalFields.target.length > 0;
const hasNothing =
!hasRequired && !hasOptional && additionalFields.optionalList.length === 0;
// render
return (
<div className="service-editor">
<div className="service-editor--name">
<b>
{service.name} /<span>{serviceId}</span>
</b>
<span>{service.description}</span>
</div>
{hasNothing ? (
<span>This Service Requires no inputs</span>
) : (
<>
{options.required.map((opt) => (
<ServiceEditorField
key={opt.type + opt.id}
option={opt}
value={data[opt.type][opt.id]}
onChange={(v) =>
onUpdate({
...data,
[opt.type]: {
...data[opt.type],
[opt.id]: v,
},
})
}
/>
))}
<div className="service-editor--used">
{additionalFields.field.map((key) => {
const serviceData = service.fields[key];
const option = convertFieldToOption(key, serviceData);
return (
<ServiceEditorField
key={"fields-" + key}
option={option}
value={data.field[key] ?? ""}
onRemove={() => {
setAdditionalFields({
...additionalFields,
field: additionalFields.field.filter((k) => k !== key),
optionalList:
additionalFields.optionalList.concat(option),
});
onUpdate({
...data,
field: cleanUpUndefined({
...data.field,
[key]: undefined,
}),
});
}}
onChange={(v) =>
onUpdate({
...data,
field: {
...data.field,
[key]: v,
},
})
}
/>
);
})}
{additionalFields.target.map((key) => {
const targetData = (service.target as any)[key];
const option = convertTargetToOption(key, targetData);
return (
<ServiceEditorField
key={"fields-" + key}
option={option}
value={data.target[key] ?? ""}
onRemove={() => {
setAdditionalFields({
...additionalFields,
target: additionalFields.target.filter((k) => k !== key),
optionalList:
additionalFields.optionalList.concat(option),
});
onUpdate({
...data,
target: cleanUpUndefined({
...data.target,
[key]: undefined,
}),
});
}}
onChange={(v) =>
onUpdate({
...data,
target: {
...data.target,
[key]: v,
},
})
}
/>
);
})}
</div>
</>
)}
<hr style={{ width: "90%" }} />
{additionalFields.optionalList.length > 0 && (
<div className="service-editor--add">
<InputAutoComplete
label="Additional Field"
helperText="Include an additional none-optional fields from this list."
className="service-editor--add--list"
value={""}
onChange={(id) => {
const newField = additionalFields.optionalList.filter(
(opt) => opt.id === id
)[0];
if (newField) {
setAdditionalFields({
...additionalFields,
[newField.type]: additionalFields[newField.type].concat([
newField.id,
]),
optionalList: additionalFields.optionalList.filter(
(opt) =>
!(opt.type === newField.type && opt.id === newField.id)
),
});
}
}}
options={additionalFields.optionalList}
/>
</div>
)}
</div>
);
};
@@ -0,0 +1,52 @@
import { BaseOption, Option } from "haService";
import { FieldData, TargetData, TypedHassService } from "haService/fieldTypes";
import { prettyName } from "utils/formatting";
export type ServiceEditorOption = BaseOption<
| {
type: "field";
data: {
description: string;
} & FieldData;
}
| {
type: "target";
data: {
description: string;
} & TargetData;
}
>;
export const convertFieldToOption = (id: string, data: FieldData): ServiceEditorOption => ({
id,
label: data.name ?? prettyName(id),
type: "field",
data,
})
export const convertTargetToOption = (id: string, data: TargetData): ServiceEditorOption => ({
id,
type: "target",
label: ((data ?? {}) as any).name ?? prettyName(id),
data: (data as any) ?? {
description: "",
},
})
export const splitUpOptions = (service: TypedHassService) => {
const required: ServiceEditorOption[] = [];
const additional: ServiceEditorOption[] = [];
Object.keys(service.fields ?? {}).forEach((key) => {
const serviceData = service.fields[key];
const opt = convertFieldToOption(key, serviceData);
if (serviceData.required) {
required.push(opt);
} else {
additional.push(opt);
}
});
Object.keys(service.target ?? {}).forEach((key) =>{
const serviceData = (service.target ?? ({} as any))[key];
additional.push(convertTargetToOption(key, serviceData))
});
return { required, additional };
};
@@ -1,27 +0,0 @@
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>
};
+19 -36
View File
@@ -1,20 +1,16 @@
import { useState, useEffect, useRef } from 'react';
import {
getAuth,
createConnection,
ERR_HASS_HOST_REQUIRED,
createLongLivedTokenAuth,
Auth,
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';
const HASS_URL = process.env.REACT_APP_HASS_URL as string;
const HASS_TOKEN = process.env.REACT_APP_HASS_TOKEN;
const HASS_SUPERVISOR_TOKEN = process.env.REACT_APP_SUPERVISOR_TOKEN as string;
export type HAConnection = {
status: 'loading'
} | {
@@ -47,52 +43,39 @@ const translateErrorCodes = (errorCode: number) => {
return errorCode;
}
const createAuth = async () => {
let auth: Auth
if (HASS_TOKEN) {
return createLongLivedTokenAuth(HASS_URL, HASS_TOKEN);
}
if (HASS_SUPERVISOR_TOKEN) {
return await getAuth({ hassUrl: HASS_URL, authCode: HASS_SUPERVISOR_TOKEN });
}
const createConnection = async () => {
try {
auth = await getAuth();
return auth
} catch (err) {
if (err !== ERR_HASS_HOST_REQUIRED) {
throw err
return _createConnection({
auth: createLongLivedTokenAuth(wsURL, 'xxx'),
});
} catch (error) {
// eslint-disable-next-line
throw {
originalError: JSON.stringify(error),
message: translateErrorCodes(error as any),
}
}
try {
auth = await getAuth({ hassUrl: HASS_URL });
return auth
} catch (err) {
throw err
}
}
async function startHAConnection() {
let connection: Connection;
try {
const auth = await createAuth();
const connection = await createConnection({ auth });
haConnection = {
status: 'loaded',
connection,
}
return haConnection;
connection = await createConnection();
} catch (error) {
haConnection = {
status: 'error',
error: {
originalError: JSON.stringify(error),
message: translateErrorCodes(error as any),
hassToken: !HASS_TOKEN ? "no" : "yes",
hasSuperToken: !HASS_SUPERVISOR_TOKEN ? "no" : "yes",
url: HASS_URL,
},
}
}
throw error
}
haConnection = {
status: 'loaded',
connection,
}
return haConnection;
}
startHAConnection().then(console.log).catch(console.error);
+83
View File
@@ -0,0 +1,83 @@
export interface TypedHassService {
name?: string;
description: string;
fields: Fields;
target?: Targets | null | undefined;
}
export type Fields = Record<string, FieldData>
export interface Targets {
device?: TargetData;
entity?: TargetData;
}
export interface TargetData {
domain?: string;
integration?: string;
}
export interface FieldData {
name?: string | undefined;
description: string;
required?: boolean;
example?: any;
selector?: FieldSelector;
advanced?: boolean;
default?: any;
}
export interface FieldSelector {
text?: SelectorText | null;
select?: SelectorSelect;
number?: SelectorNumber;
boolean?: null;
object?: null;
theme?: null;
addon?: null;
entity?: TargetData;
icon?: null;
color_rgb?: null;
color_temp?: SelectorColorTemp | null;
time?: null;
}
interface SelectorColorTemp {
min_mireds: number;
max_mireds: number;
}
interface SelectorNumber {
min: number;
max: number;
unit_of_measurement?: UnitOfMeasurement;
mode?: Mode;
step?: number;
}
enum Mode {
Box = "box",
}
enum UnitOfMeasurement {
Days = "days",
Empty = "%",
K = "K",
Seconds = "seconds",
Times = "times",
}
interface SelectorSelect {
options: OptionElement[];
}
type OptionElement = OptionClass | string;
interface OptionClass {
label: string;
value: string;
}
interface SelectorText {
multiline: boolean;
}
+147 -3
View File
@@ -1,13 +1,18 @@
import { entitiesColl, servicesColl } from "home-assistant-js-websocket"
import { Namer } from "utils/formatting";
import { deviceRegistryColl } from "./DeviceRegistry";
import { entityRegistryColl } from "./EntityRegistry";
import { DeviceRegistryItem } from "./types";
import { useHassCollection } from "./useHassCollection"
import { useHAConnection } from './connection';
import { useSnackbar } from "notistack";
import { TypedHassService } from "./fieldTypes";
export type Option<T = {}> = string | ({
export type BaseOption<T = {}> = {
id: string,
label: string,
} & T)
} & T
export type Option<T = {}> = string | BaseOption<T>;
export type EntityOption = Option<{ domain: string; }>
export type HAEntitiesState = ReturnType<typeof useHAEntities>;
export const useHAEntities = () => {
@@ -73,10 +78,77 @@ export const useHAEntities = () => {
}
}
export type ServiceOption = Option<{
domain: string,
action: string,
description: string,
data: TypedHassService,
}>;
export type HAServicesState = ReturnType<typeof useHAServices>;
export const useHAServices = () => {
const services = useHassCollection(servicesColl);
const methods = {
getOption(name: string): TypedHassService | null {
if (!services.ready) {
return null;
}
try {
const [domain, action] = name.split('.');
return {
name: services.collection.state[domain][action].name ?? `${domain}.${action}`,
description: services.collection.state[domain][action].description ?? "",
target: services.collection.state[domain][action].target,
fields: services.collection.state[domain][action].fields,
}
}catch(err: any) {
console.warn(err)
return null
}
},
getOptions(): ServiceOption[] {
if (!services.ready) {
return []
}
return Object.keys(services.collection.state).reduce<ServiceOption[]>((all, domain) => {
const opts = Object.keys(services.collection.state[domain]).map<ServiceOption>(
action => ({
id: `${domain}.${action}`,
label: services.collection.state[domain][action].name ?? `${domain}.${action}`,
description: services.collection.state[domain][action].description ?? "",
domain,
action,
data: {
name: services.collection.state[domain][action].name ?? `${domain}.${action}`,
description: services.collection.state[domain][action].description ?? "",
target: services.collection.state[domain][action].target,
fields: services.collection.state[domain][action].fields,
}
})
)
return all.concat(opts);
}, [])
},
getLabel: (opt: ServiceOption): string => {
if (typeof opt === 'string') {
if (services.ready) {
try {
const [domain, action] = opt.split('.');
return services.collection.state[domain][action].name ?? opt;
} catch (_) { }
}
return opt
}
return opt.label ?? opt.id
},
getID: (opt: ServiceOption): string => {
if (typeof opt === 'string') {
return opt
}
return opt.id
}
}
return services
return { ...services, ...methods }
}
export type DeviceRegistryOption = Option<{ manufacturer: string }>;
@@ -120,4 +192,76 @@ export const useHAEntityRegistry = () => {
const dr = useHassCollection(entityRegistryColl)
return dr
}
export const useHA = () => {
const entities = useHAEntities();
const devices = useHADeviceRegistry();
const services = useHAServices();
const conn = useHAConnection();
const { enqueueSnackbar } = useSnackbar();
const callService = async (
domain: string,
service: string,
data: any = {},
target: any = {},
) => {
if (conn.status === 'loaded') {
try {
const result = await conn.connection.sendMessagePromise({
"type": "call_service",
domain,
service,
target,
service_data: data
})
enqueueSnackbar(`Successfully called ${domain}.${service}`, {
"variant": "success",
})
return result
} catch (err: any) {
let msg = JSON.stringify(err)
if ('message' in err) {
msg = err.message
}
enqueueSnackbar(`Failed to call ${domain}.${service} because '${msg}'`, {
"variant": "error",
})
return
}
} if (conn.status === 'error') {
enqueueSnackbar(`Failed to call service because connection is '${conn.status}' -- ${conn.error}`, {
"variant": "error"
})
} else {
enqueueSnackbar(`Failed to call service because connection is '${conn.status}'`, {
"variant": "error"
})
}
}
const namer: Namer = {
getDeviceName(device_id) {
return devices.getLabel(device_id)
},
getEntityName(entity_id, maxEntities = 1) {
if (Array.isArray(entity_id)) {
return entity_id.slice(0, maxEntities).map(entities.getLabel).join(', ')
}
return entities.getLabel(entity_id)
},
getServiceName(service) {
return services.getLabel(service)
},
}
return {
entities,
devices,
services,
namer,
callService,
reloadAutomations: () => callService("automation", "reload")
}
}
+219
View File
@@ -0,0 +1,219 @@
import React, { FC, useEffect, useState } from "react";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useHA } from "haService";
import InputYaml from "components/Inputs/InputYaml";
import { InputList } from "components/Inputs/InputList";
import { Button } from "components/Inputs/Button";
import { ServiceEditor } from "components/ServiceEditor";
const Test: FC = () => {
const { services, callService } = useHA();
const data = services.collection?.state ?? {};
const options = Object.keys(data).sort();
// const flattened: any[] = [];
// Object.keys(data).forEach(domain => {
// Object.keys(data[domain]).forEach(
// service_name => {
// const service = data[domain][service_name];
// const all: any = {
// domain, service_name,
// }
// flattened.push({
// domain, service_name,
// fields: Object.keys(service.fields).map(k => ({
// name: k,
// data: service.fields[k]
// })),
// target: Object.keys(service.target ?? {}).map(k => ({
// name: k,
// data: (service.target as any)[k]
// }))
// })
// }
// )
// })
// console.log(flattened)
// const summary: Record<string, Record<string, { total: number, domains: string[], values: Set<string> }>> = {}
// const fields: Record<string, Record<string, { total: number, values: Set<string> }>> = {}
// const target: Record<string, Record<string, { total: number, values: Set<string> }>> = {}
// Object.keys(data).forEach(domain =>
// Object.keys(data[domain]).forEach(
// action => {
// const service = data[domain][action];
// Object.keys(service.fields).forEach(field => {
// const value = service.fields[field];
// const valueType = `${typeof value}-${Array.isArray(value)}`;
// fields[field] = fields[field] ?? {}
// fields[field][valueType] = fields[field][valueType] ?? {
// total: 0,
// domains: [],
// values: new Set()
// }
// fields[field][valueType].total += 1
// fields[field][valueType].values.add(JSON.stringify(value))
// })
// Object.keys(service.target ?? {}).forEach(field => {
// const value = (service.target as any)[field];
// const valueType = `${typeof value}-${Array.isArray(value)}`;
// target[field] = target[field] ?? {}
// target[field][valueType] = target[field][valueType] ?? {
// total: 0,
// domains: [],
// values: new Set()
// }
// target[field][valueType].total += 1
// target[field][valueType].values.add(JSON.stringify(value))
// })
// Object.keys(service).forEach(field => {
// const value = (service as any)[field];
// const valueType = `${typeof value}-${Array.isArray(value)}`;
// summary[field] = summary[field] ?? {}
// summary[field][valueType] = summary[field][valueType] ?? {
// total: 0,
// domains: [],
// values: new Set()
// }
// summary[field][valueType].total += 1
// summary[field][valueType].domains.push(`${domain}.${action}`)
// summary[field][valueType].values.add(JSON.stringify(value))
// })
// }
// )
// )
const [domain, setDomain] = useState(options[0] ?? "");
const domains = Object.keys(data[domain] ?? "").sort();
const [service, setService] = useState(domains[0] ?? "");
const serviceDefn = (data[domain] ?? {})[service] ?? {};
useEffect(() => {
setService(domains[0] ?? "");
}, [domain, setService]);
let serviceEditElm = <>Failed to load</>;
try {
if (service) {
serviceEditElm = (
<div
style={{
border: "1px solid var(--primary-accent)",
maxWidth: "100vw",
padding: "2.5em",
margin: "2.5em",
}}
>
<ServiceEditor
service={serviceDefn}
serviceId={`${domain}.${service}`}
data={{ field: {}, target: {} }}
onUpdate={() => {}}
/>
</div>
);
}
} catch (err) {
serviceEditElm = <>{JSON.stringify(err)}</>;
}
return (
<div style={{ overflow: "auto", maxHeight: "100vh" }}>
<InputList
label="Domains"
current={domain}
onChange={setDomain}
options={options}
/>
<InputList
label="Services"
current={service}
onChange={setService}
options={domains}
/>
<Button onClick={() => callService(domain, service)}>Call</Button>
{serviceEditElm}
<InputYaml label="Service Data" value={serviceDefn} onChange={() => {}} />
<code>{JSON.stringify(serviceDefn, null, 4)}</code>
{/* <ul style={{
maxHeight: '20vh',
overflow: 'auto',
}}>
{Object.keys(summary).map(k => <li key={k}>
<b>{k}</b> <ul>
{Object.keys(summary[k]).map(t => <li key={k + t}>
<b>{t}</b> ({summary[k][t].total})
<ul style={{ maxHeight: '200px', overflow: 'auto' }}>
{Array.from(summary[k][t].values.values()).sort().map((v, i) => <li key={i}>
{v}
</li>)}
</ul>
</li>)}
</ul>
</li>)}
</ul>
<h1>Fields</h1>
<ul style={{
maxHeight: '20vh',
overflow: 'auto',
}}>
{Object.keys(fields).map(k => <li key={k}>
<b>{k}</b> <ul>
{Object.keys(fields[k]).map(t => <li key={k + t}>
<b>{t}</b> ({fields[k][t].total})
<ul style={{ maxHeight: '200px', overflow: 'auto' }}>
{Array.from(fields[k][t].values.values()).sort().map((v, i) => <li key={i}>
{v}
</li>)}
</ul>
</li>)}
</ul>
</li>)}
</ul>
<h1>Targets</h1>
<ul style={{
maxHeight: '20vh',
overflow: 'auto',
}}>
{Object.keys(target).map(k => <li key={k}>
<b>{k}</b> <ul>
{Object.keys(target[k]).map(t => <li key={k + t}>
<b>{t}</b> ({target[k][t].total})
<ul style={{ maxHeight: '200px', overflow: 'auto' }}>
{Array.from(target[k][t].values.values()).sort().map((v, i) => <li key={i}>
{v}
</li>)}
</ul>
</li>)}
</ul>
</li>)}
</ul> */}
</div>
);
};
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>
);
};
+8
View File
@@ -15,3 +15,11 @@ ReactDOM.render(
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();
// import { createRoot } from 'react-dom/client';
// const container = document.getElementById('root');
// const root = createRoot(container!);
// root.render(<React.StrictMode>
// <App />
// </React.StrictMode>);
+2 -1
View File
@@ -1,5 +1,4 @@
import { AutomationSequenceNode } from ".";
import { AutomationTime } from "./common";
import { AutomationCondition } from "./conditions";
import * as v from "types/validators/actions";
import * as st from 'superstruct';
@@ -15,6 +14,7 @@ export type RepeatAction = AutomationActionNodeBase<{
}
}>
export type WaitAction = st.Infer<typeof v.WaitAction>;
export type DelayAction = st.Infer<typeof v.DelayAction>;
export type FireEventAction = st.Infer<typeof v.FireEventAction>;
export type DeviceAction = st.Infer<typeof v.DeviceAction>;
export type ChooseAction = AutomationActionNodeBase<{
@@ -28,6 +28,7 @@ export type AutomationAction =
| ServiceAction
| RepeatAction
| WaitAction
| DelayAction
| FireEventAction
| DeviceAction
| ChooseAction
@@ -3,6 +3,7 @@ import * as st from 'superstruct';
import * as v from "types/validators/conditions";
type AutomationConditionNodeBase<Name extends String, Data extends Object> = {
condition: Name;
enabled?: boolean;
} & Data;
export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', {
conditions: AutomationCondition[];
Loaded 100 of 108 files, more files were not shown because too many files have changed in this diff. Show more