Compare commits

..
23 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
75 changed files with 2501 additions and 707 deletions

No files matched your search

+13
View File
@@ -1,5 +1,18 @@
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) # Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [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 ## [0.1.19] - Vertical mobile mode
- in mobile mode we draw the graphs vertically now - in mobile mode we draw the graphs vertically now
+1 -1
View File
@@ -33,7 +33,7 @@ test:
coverage: coverage:
$(VENV_BIN)/coverage run -m unittest discover tests $(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=85 $(VENV_BIN)/coverage report -m --fail-under=80
clean: clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
+12 -2
View File
@@ -1,11 +1,13 @@
import asyncio import asyncio
import json import json
from fastapi import APIRouter, WebSocket from fastapi import APIRouter, WebSocket, WebSocketDisconnect
from src.logger import get_logger
from src.ws_redirect import WSRedirector from src.ws_redirect import WSRedirector
router = APIRouter() router = APIRouter()
logger = get_logger(__name__)
@router.websocket("/api/websocket") @router.websocket("/api/websocket")
@@ -19,7 +21,15 @@ async def websocket_endpoint(websocket: WebSocket):
async def wait_for_data(): async def wait_for_data():
while True: while True:
await conn.send(await websocket.receive_text()) 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 websocket.accept()
+4
View File
@@ -14,3 +14,7 @@ else:
logging.basicConfig(level=logging.NOTSET) logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger() logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
+20 -10
View File
@@ -1,12 +1,15 @@
import asyncio
import json import json
from typing import Any, Callable, Coroutine, Optional from typing import Callable, Coroutine, Optional
import websockets from websockets.client import WebSocketClientProtocol, connect
from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import logger from src.logger import get_logger, logger
OnMessage = Callable[[str], Coroutine] OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__)
class WSRedirector: class WSRedirector:
@@ -19,7 +22,7 @@ class WSRedirector:
self._host = host self._host = host
self._token = token self._token = token
self._on_message = on_message self._on_message = on_message
self._client: Optional[Any] = None self._client: Optional[WebSocketClientProtocol] = None
self._close: bool = False self._close: bool = False
@property @property
@@ -31,19 +34,26 @@ class WSRedirector:
return await self._client.send(msg) return await self._client.send(msg)
async def start(self): async def start(self):
async with websockets.connect(self._host) as websocket: async with connect(self._host) as websocket:
self._client = websocket self._client = websocket
await websocket.send(json.dumps({"type": "auth", "access_token": self._token})) await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
while not self.is_closed: while not self.is_closed:
msg = await websocket.recv() try:
logger.debug(f"WS:MSG: {msg}") msg = await websocket.recv()
await self.process_message(msg) # 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): async def process_message(self, msg: str):
await self._on_message(msg) await self._on_message(msg)
def close(self): async def close(self):
self._close = True self._close = True
await self._client.close()
def __del__(self): def __del__(self):
self.close() 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 name: Shortumation
version: v0.1.19 version: v0.1.21
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch} image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
+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
},
]
}
+3
View File
@@ -6,6 +6,7 @@
"dependencies": { "dependencies": {
"@emotion/react": "^11.9.0", "@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1", "@emotion/styled": "^11.8.1",
"@mui/icons-material": "^5.8.3",
"@mui/material": "^5.8.0", "@mui/material": "^5.8.0",
"@mui/styles": "^5.8.0", "@mui/styles": "^5.8.0",
"@types/jest": "^27.5.1", "@types/jest": "^27.5.1",
@@ -19,8 +20,10 @@
"jss": "^10.8.2", "jss": "^10.8.2",
"notistack": "^2.0.5", "notistack": "^2.0.5",
"react": "^18.1.0", "react": "^18.1.0",
"react-cookie": "^4.1.1",
"react-dom": "^18.1.0", "react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2", "react-flow-renderer": "^10.1.2",
"react-imask": "^6.4.2",
"react-jss": "^10.8.2", "react-jss": "^10.8.2",
"react-router-dom": "6", "react-router-dom": "6",
"react-scripts": "5.0.1", "react-scripts": "5.0.1",
+8 -5
View File
@@ -3,6 +3,7 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation'; import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService'; import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary'; import { ErrorBoundary } from 'components/ErrorBoundary';
import { CookiesProvider } from "react-cookie";
function App() { function App() {
const api = useConnectedApiService(); const api = useConnectedApiService();
@@ -10,11 +11,13 @@ function App() {
return ( return (
<div className="app"> <div className="app">
<ErrorBoundary> <ErrorBoundary>
<BrowserRouter> <CookiesProvider>
<Routes> <BrowserRouter>
<Route path="*" element={<AutomationRoute api={api} />} /> <Routes>
</Routes> <Route path="*" element={<AutomationRoute api={api} />} />
</BrowserRouter> </Routes>
</BrowserRouter>
</CookiesProvider>
</ErrorBoundary> </ErrorBoundary>
</div> </div>
); );
+1 -1
View File
@@ -7,7 +7,7 @@ import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i); const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL( const baseURL = new URL(
process.env.NODE_ENV === 'development' ? process.env.NODE_ENV === 'development' ?
"http://localhost:8000" : `http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1]) window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
); );
export const wsURL = baseURL + "socket" export const wsURL = baseURL + "socket"
+3 -3
View File
@@ -5,7 +5,7 @@ import { AutomationAPI } from './automations';
export const useDefaultApiState = () => useState<ApiState>({ export const useDefaultApiState = () => useState<ApiState>({
automations: {ready: false}, automations: { ready: false },
}); });
export const makeReloadAutomations = ( export const makeReloadAutomations = (
@@ -21,8 +21,8 @@ export const makeReloadAutomations = (
const resp = await automationAPI.list(params); const resp = await automationAPI.list(params);
setState({ setState({
...state, automations: { ...state, automations: {
ready: true, ready: true,
...resp, ...resp,
} }
}); });
} }
@@ -28,13 +28,9 @@
.automation-editor--flow-wrapper--toolbar { .automation-editor--flow-wrapper--toolbar {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 0.25em;
justify-content: flex-end; justify-content: flex-end;
} margin-top: 0.25em;
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
} }
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * { .automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
@@ -1,6 +1,7 @@
import "./index.css"; import "./index.css";
import Icon from '@mui/material/Icon';
import { ArrowIcon, CheckMarkIcon } from "components/Icons"; import { ArrowIcon, CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react"; import { FC, useEffect, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
@@ -37,8 +38,16 @@ export const AutomationEditor: FC<Props> = ({
save, save,
saveAndUpdate, saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate); } = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [closeInfo, setCloseInfo] = useState(false); const [closeInfo, setCloseInfo] = useState(false);
const [flipped, setFlipped] = useState(dims.flipped);
// effect
useEffect(() => {
if (dims.flipped !== flipped) {
setFlipped(dims.flipped)
}
// eslint-disable-next-line
}, [dims.flipped])
// render // render
if (state.status === 'loading') { if (state.status === 'loading') {
@@ -75,6 +84,13 @@ export const AutomationEditor: FC<Props> = ({
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}> <div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar"> <div className="automation-editor--flow-wrapper--toolbar">
{!dims.flipped && <Button
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
onClick={() => setFlipped(!flipped)}
>
<Icon>{flipped ? 'flip_to_front' : 'flip_to_back'}</Icon>
Flip
</Button>}
<Button <Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"} className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save} onClick={save}
@@ -91,7 +107,10 @@ export const AutomationEditor: FC<Props> = ({
onSequenceUpdate={updateSequence} onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger} onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition} onConditionUpdate={updateCondition}
dims={dims} dims={{
...dims,
flipped,
}}
/> />
</div> </div>
</div> </div>
@@ -3,6 +3,7 @@ import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox"; import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page"; import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie";
export default { export default {
title: 'App/AutomationList/Box', title: 'App/AutomationList/Box',
@@ -16,10 +17,12 @@ export default {
const Template: ComponentStory<typeof AutomationListBox> = args => { const Template: ComponentStory<typeof AutomationListBox> = args => {
const [selected, setSelected] = useState(args.selected) const [selected, setSelected] = useState(args.selected)
return <Page> return <Page>
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => { <CookiesProvider>
setSelected(i) <AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
args.onSelectAutomation(i) setSelected(i)
}} /> args.onSelectAutomation(i)
}} />
</CookiesProvider>
</Page> </Page>
} }
@@ -6,6 +6,7 @@ import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Button";
import { makeGrouping } from "./automationGrouper"; import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup"; import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie";
export type Props = { export type Props = {
@@ -16,6 +17,39 @@ export type Props = {
onAdd: () => void; onAdd: () => void;
} }
const useAutomationListBoxState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_
] = useCookies(['albSearchText', 'albSelected']);
let initialSelected = [];
try {
initialSelected = JSON.parse(cookies.albSelected)
if (!Array.isArray(initialSelected)) {
initialSelected = [initialSelected]
}
initialSelected = initialSelected.map(Number)
// eslint-disable-next-line
} catch (_) { }
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>(initialSelected);
return {
searchText,
setSearchText(v: string) {
setSearchText(v)
setCookies('albSearchText', v)
},
setSelectedTagIdx(n: number[]) {
setSelectedTagIdx(n)
setCookies('albSelected', JSON.stringify(n))
},
selectedTagIdx,
}
}
export const AutomationListBox: FC<Props> = ({ export const AutomationListBox: FC<Props> = ({
automations, automations,
selected, selected,
@@ -25,9 +59,13 @@ export const AutomationListBox: FC<Props> = ({
}) => { }) => {
const tags = getTagList(automations); const tags = getTagList(automations);
const [searchText, setSearchText] = useState(''); const {
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]); searchText,
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags); setSearchText,
selectedTagIdx,
setSelectedTagIdx,
} = useAutomationListBoxState();
const filteredAutomations = filterAutomations(automations, searchText.toLowerCase(), selectedTagIdx, tags);
const grouping = makeGrouping( const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a), filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map(i => tags[i]), selectedTagIdx.map(i => tags[i]),
@@ -67,4 +67,12 @@
top: 0.75em; top: 0.75em;
background-color: var(--green-opaque); background-color: var(--green-opaque);
z-index: 30; z-index: 30;
}
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
} }
+41 -4
View File
@@ -13,6 +13,8 @@ import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB"; import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress"; import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress"; import CircularProgress from "@mui/material/CircularProgress";
import { useCookies } from 'react-cookie';
import { useHA } from "haService";
interface AutomationListParams { interface AutomationListParams {
@@ -24,6 +26,32 @@ interface AutomationListParams {
children?: ReactNode; children?: ReactNode;
} }
export const useAutomationListState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_
] = useCookies(['alCurrent']);
let initialCurrent = 0;
try {
initialCurrent = Number(cookies.alCurrent ?? '0');
} catch (_) { }
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(initialCurrent);
return {
hideList,
setHideList,
current,
setCurrent(i: number) {
setCurrent(i)
setCookies('alCurrent', String(i))
}
}
}
export const AutomationList: FC<AutomationListParams> = ({ export const AutomationList: FC<AutomationListParams> = ({
automations, automations,
onUpdate, onUpdate,
@@ -33,8 +61,7 @@ export const AutomationList: FC<AutomationListParams> = ({
children, children,
}) => { }) => {
// state // state
const [hideList, setHideList] = useState(false); const { hideList, setHideList, current, setCurrent } = useAutomationListState();
const [current, setCurrent] = useState(0);
const { isMobile } = useWindowSize(); const { isMobile } = useWindowSize();
// alias // alias
const currentAuto = automations.length > 0 ? automations[current] : null; const currentAuto = automations.length > 0 ? automations[current] : null;
@@ -87,11 +114,21 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
state: { state: {
automations, automations,
}, },
removeAutomation, ...methods
updateAutomation,
}, },
dims dims
}) => { }) => {
const { reloadAutomations } = useHA();
const removeAutomation = async (args: any) => {
const resp = await methods.removeAutomation(args)
await reloadAutomations();
return resp
}
const updateAutomation = async (args: any) => {
const resp = await methods.updateAutomation(args)
await reloadAutomations();
return resp
}
if (!automations.ready) { if (!automations.ready) {
return <div className="automation-list--root loading"> return <div className="automation-list--root loading">
<LinearProgress /> <LinearProgress />
@@ -9,6 +9,7 @@ import { getEditor } from "./editorRender";
import { useStyles } from "./style"; import { useStyles } from "./style";
import { getViewer } from "./viewRender"; import { getViewer } from "./viewRender";
import useWindowSize from "utils/useWindowSize"; import useWindowSize from "utils/useWindowSize";
import { useHA } from "haService";
@@ -33,6 +34,7 @@ export const ConditionNode: FC<{
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode); const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false); const [yamlMode, setYamlMode] = useState(false);
const { isMobile } = useWindowSize(); const { isMobile } = useWindowSize();
const { namer } = useHA();
// alias // alias
const effectiveDM = internalDisplayMode || yamlMode; const effectiveDM = internalDisplayMode || yamlMode;
// effect // effect
@@ -64,7 +66,7 @@ export const ConditionNode: FC<{
let childrenConditions: JSX.Element; let childrenConditions: JSX.Element;
if (effectiveDM) { if (effectiveDM) {
const Viewer = getViewer(condition); const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={onUpdate} /> childrenConditions = <Viewer condition={condition} onChange={onUpdate} namer={namer} />
} else { } else {
const Editor = getEditor(condition); const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={onUpdate} /> childrenConditions = <Editor condition={condition} onChange={onUpdate} />
@@ -5,7 +5,7 @@ import InputText from "components/Inputs/InputText";
import { InputEntity } from "components/Inputs/InputEntities"; import { InputEntity } from "components/Inputs/InputEntities";
import { ConditionNode } from "./ConditionNode"; import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
import InputTime from "components/Inputs/InputTime"; import { InputTime } from "components/Inputs/InputTime";
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/InputYaml";
@@ -1,12 +1,13 @@
import { FC } from "react"; import { FC } from "react";
import { AutomationCondition, LogicCondition } from "types/automations/conditions"; import { AutomationCondition, LogicCondition } from "types/automations/conditions";
import { getDescriptionFromAutomationNode } from "utils/formatting"; import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { ConditionNode } from "./ConditionNode"; import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
interface Viewer<C extends AutomationCondition> extends FC<{ interface Viewer<C extends AutomationCondition> extends FC<{
condition: C; condition: C;
namer: Namer;
onChange: (condition: C) => void; onChange: (condition: C) => void;
}> { } }> { }
@@ -23,9 +24,10 @@ export const getViewer = (condition: AutomationCondition): Viewer<any> => {
export const GenericViewer: Viewer<AutomationCondition> = ({ export const GenericViewer: Viewer<AutomationCondition> = ({
condition, condition,
namer,
}) => { }) => {
return <> return <>
{getDescriptionFromAutomationNode(condition)} {getDescriptionFromAutomationNode(condition, namer)}
</> </>
} }
+14 -2
View File
@@ -16,6 +16,7 @@ import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods"; import { makeConditionPoint } from "./flowDataMods";
import { convertToFlowNode } from "./helpers"; import { convertToFlowNode } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode"; import { DAGErrorNode } from "./DAGErrorNode";
import { useHA } from "haService";
const nodeTypes = { const nodeTypes = {
'dagnode': convertToFlowNode(DAGNode), 'dagnode': convertToFlowNode(DAGNode),
@@ -57,10 +58,9 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
}) => { }) => {
// state // state
const [modalState, setModalState] = useState<ModalState | null>(null); const [modalState, setModalState] = useState<ModalState | null>(null);
const { namer, } = useHA();
// modal // modal
let modalBody = <></> let modalBody = <></>
console.log(modalState)
if (modalState) { if (modalState) {
if (modalState.single) { if (modalState.single) {
modalBody = <NodeEditor modalBody = <NodeEditor
@@ -102,6 +102,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
edges: [], edges: [],
} }
triggerToFlow(flowData, trigger, condPoint.id, dims, { triggerToFlow(flowData, trigger, condPoint.id, dims, {
namer,
onAdd: () => onTriggerUpdate([ onAdd: () => onTriggerUpdate([
...trigger, { ...trigger, {
platform: 'event', platform: 'event',
@@ -136,8 +137,19 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
y: dims.padding.y, y: dims.padding.y,
} }
}, },
namer,
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState), makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
); );
// this fixes some strange edge drawing issue
flowData.edges = flowData.edges.map(e => ({
...e,
"source": `${e.source}-${dims.flipped}`,
"target": `${e.target}-${dims.flipped}`,
}))
flowData.nodes = flowData.nodes.map(n => ({
...n,
id: `${n.id}-${dims.flipped}`
}))
// render // render
return <> return <>
<Modal open={!!modalState}> <Modal open={!!modalState}>
@@ -1,6 +1,6 @@
import { AutomationSequenceNode } from 'types/automations'; import { AutomationSequenceNode } from 'types/automations';
import { DAGAutomationFlowDims, FlowData } from './types'; import { DAGAutomationFlowDims, FlowData } from './types';
import { getDescriptionFromAutomationNode } from 'utils/formatting'; import { getDescriptionFromAutomationNode, Namer } from 'utils/formatting';
import { XYPosition } from 'react-flow-renderer'; import { XYPosition } from 'react-flow-renderer';
import { ChooseAction } from 'types/automations/actions'; import { ChooseAction } from 'types/automations/actions';
import { makeFlowCircle } from './DAGCircle'; import { makeFlowCircle } from './DAGCircle';
@@ -14,6 +14,7 @@ export const sequenceToFlow = (
sequence: AutomationSequenceNode[], sequence: AutomationSequenceNode[],
fromPoint: string, fromPoint: string,
dims: DAGAutomationFlowDims, dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater, updater: SequenceUpdater,
prefix: string = "", prefix: string = "",
) => { ) => {
@@ -45,7 +46,7 @@ export const sequenceToFlow = (
if (getNodeType(node) === 'action') { if (getNodeType(node) === 'action') {
if ('choose' in node) { if ('choose' in node) {
try { try {
const out = addChooseNode(node, position, nodeId, dims, updater, i); const out = addChooseNode(node, position, nodeId, dims, namer, updater, i);
position = out.lastPos position = out.lastPos
flowData = mergeFlowDatas(flowData, out.flowData); flowData = mergeFlowDatas(flowData, out.flowData);
} catch (err) { } catch (err) {
@@ -55,13 +56,15 @@ export const sequenceToFlow = (
} else { } else {
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i) onXClick: () => updater.removeNode(i),
namer,
}); });
} }
} else { } else {
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i) onXClick: () => updater.removeNode(i),
namer,
}); });
} }
@@ -124,12 +127,13 @@ const addSingleNode = (
opts: { opts: {
onEditClick: () => void; onEditClick: () => void;
onXClick: () => void; onXClick: () => void;
namer: Namer;
} }
) => flowData.nodes.push({ ) => flowData.nodes.push({
id: nodeId, id: nodeId,
type: 'dagnode', type: 'dagnode',
data: { data: {
label: getDescriptionFromAutomationNode(node), label: getDescriptionFromAutomationNode(node, opts.namer),
height: nodeHeight, height: nodeHeight,
width: nodeWidth, width: nodeWidth,
color: getNodeType(node) === 'action' ? 'green' : 'blue', color: getNodeType(node) === 'action' ? 'green' : 'blue',
@@ -171,6 +175,7 @@ const addChooseNode = (
position: XYPosition, position: XYPosition,
nodeId: string, nodeId: string,
dims: DAGAutomationFlowDims, dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater, updater: SequenceUpdater,
i: number, i: number,
) => { ) => {
@@ -181,6 +186,7 @@ const addChooseNode = (
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i), onXClick: () => updater.removeNode(i),
namer,
}); });
let lastPos: XYPosition = position; let lastPos: XYPosition = position;
// conditions // conditions
@@ -230,7 +236,7 @@ const addChooseNode = (
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth), x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2, y: condNode.position.y - dims.conditionHeight / 2,
}, },
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`); }, namer, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) { if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max) lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else { } else {
@@ -290,7 +296,7 @@ const addChooseNode = (
x: position.x - dims.nodeWidth, x: position.x - dims.nodeWidth,
y: elseCircle.position.y - dims.circleSize / 4, y: elseCircle.position.y - dims.circleSize / 4,
}, },
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`) }, namer, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) { if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max) lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else { } else {
@@ -16,7 +16,6 @@ export const triggerToFlow = (
nodeWidth, nodeWidth,
padding, padding,
conditionHeight, conditionHeight,
conditionWidth,
circleSize, circleSize,
flipped, flipped,
} = dims; } = dims;
@@ -27,7 +26,7 @@ export const triggerToFlow = (
id: flowId, id: flowId,
type: 'dagnode', type: 'dagnode',
data: { data: {
label: getDescriptionFromAutomationNode(t), label: getDescriptionFromAutomationNode(t, opts.namer),
height: nodeHeight, height: nodeHeight,
width: nodeWidth, width: nodeWidth,
flipped, flipped,
+2
View File
@@ -5,6 +5,7 @@ import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types'; import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
import { DAGErrorNodeProps } from './DAGErrorNode'; import { DAGErrorNodeProps } from './DAGErrorNode';
import { Namer } from 'utils/formatting';
export type DAGAutomationFlowDims = { export type DAGAutomationFlowDims = {
@@ -28,6 +29,7 @@ export type TriggerMakerOptions = {
onAdd: () => void, onAdd: () => void,
onEdit: (i: number) => void, onEdit: (i: number) => void,
onDelete: (i: number) => void, onDelete: (i: number) => void,
namer: Namer,
} }
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = ( export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
@@ -1,26 +1,26 @@
.input-entities .BaseBadge-root { .input-autocomplete .BaseBadge-root {
max-width: 100%; max-width: 100%;
} }
.input-entities--chip>span { .input-autocomplete--chip>span {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 0.15em; gap: 0.15em;
} }
.input-entities--chip>span>small::before { .input-autocomplete--chip>span>small::before {
content: "/ "; content: "/ ";
} }
.input-entities--chip>span>small { .input-autocomplete--chip>span>small {
size: 0.15em; size: 0.15em;
} }
.input-entities--errors { .input-autocomplete--errors {
margin-top: 0.75em; margin-top: 0.75em;
} }
.input-entities--errors ul { .input-autocomplete--errors ul {
padding: 0 0 0 1em; padding: 0 0 0 1em;
margin: 0; margin: 0;
max-height: 2.5em; max-height: 2.5em;
@@ -28,7 +28,7 @@
overflow-x: hidden; overflow-x: hidden;
} }
.input-entities--tags { .input-autocomplete--tags {
max-height: 5em; max-height: 5em;
max-width: 100%; max-width: 100%;
overflow: auto; overflow: auto;
@@ -0,0 +1,204 @@
import "./InputAutoComplete.css";
import { Option } from "haService";
import Autocomplete from "@mui/material/Autocomplete";
import TextField from "@mui/material/TextField";
import Chip from "@mui/material/Chip";
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
export type InputAutoCompleteProps<T extends Option<any>> = {
className?: string;
validateOption?: (v: string[]) => string[] | null;
groupBy?: (opt: T) => string;
options: T[];
getLabel?: (opt: T) => string;
getID?: (opt: T) => string;
helperText?: string;
} & InputAutoCompletePropsBase;
export type InputAutoCompletePropsBase = {
label?: string;
} & (
| {
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
}
| {
value: string | string[];
multiple: true;
onChange: (v: string[]) => void;
}
);
export function InputAutoComplete<T extends Option>(
props: InputAutoCompleteProps<T>
) {
// aliases
const getID = (opt: T): string => {
if (props.getID) {
return props.getID(opt);
}
if (typeof opt === "string") {
return opt;
}
return opt.id;
};
const getLabel = (opt: T): string => {
if (props.getLabel) {
return props.getLabel(opt);
}
if (typeof opt === "string") {
return opt;
}
return opt.label;
};
// processing of inputs
const value = Array.isArray(props.value)
? props.value
: !!props.value
? [props.value]
: [];
const errors = props.validateOption ? props.validateOption(value) : null;
const options = props.options.sort((a, b) => {
return getID(a) > getID(b) ? 1 : -1;
});
// processing of errors
let helperText = props.helperText ?? <></>;
let error: boolean = false;
if (errors !== null) {
error = true;
if (errors.length > 0) {
helperText = (
<Badge
className="input-autocomplete--errors"
badgeContent={errors.length}
color="error"
>
<ul title={errors.join(", and")}>
{errors.map((msg, i) => (
<li key={i}>{msg}</li>
))}
</ul>
</Badge>
);
}
}
// events
const onChange = (_e: any, v: any) => {
const cleanValue: string[] =
v === null
? []
: Array.isArray(v)
? v.map((opt) => {
if (typeof opt === "string") {
return opt;
}
return opt.id;
})
: [v];
if (props.multiple) {
props.onChange(cleanValue);
} else {
props.onChange(cleanValue[cleanValue.length - 1]);
}
};
return (
<Autocomplete
className={["input-autocomplete", props.className ?? ""].join(" ")}
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={getLabel as any}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase().trim();
if (!searchTerm) {
return opts;
}
return opts
.map((opt) => {
let similarityScore = 0;
const eid = getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length);
}
const name = getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length);
}
return {
label: name,
id: eid,
domain: typeof opt === "string" ? "" : (opt as any).domain,
similarityScore,
};
})
.filter((opt) => opt.similarityScore > 0)
.sort((a, b) => {
return a.similarityScore > b.similarityScore ? 1 : -1;
}) as any;
}}
groupBy={props.groupBy}
renderOption={(listProps, option, { inputValue }) => {
const label = getLabel(option);
const id = getID(option);
return (
<SearchItem
key={label + id}
listProps={listProps}
id={id}
label={label}
searchTerm={inputValue}
/>
);
}}
renderInput={(params) => (
<TextField
{...params}
variant="filled"
label={props.label ?? "Entity ID"}
helperText={helperText}
error={error}
/>
)}
renderTags={(tagValue, getTagProps) => {
const inner = (
<div className="input-autocomplete--tags">
{tagValue.map((option, index) => {
const label = getLabel(option);
const id = getID(option);
const tagProps = getTagProps({ index });
tagProps.className += " input-autocomplete--chip";
return (
<Chip
size="medium"
label={
<>
{id === label ? <span>{label}</span> : <b>{label}</b>}
{id !== label && <small>{id}</small>}
</>
}
{...tagProps}
/>
);
})}
</div>
);
if (props.multiple) {
return (
<Badge badgeContent={tagValue.length} color="info">
{inner}
</Badge>
);
} else {
return inner;
}
}}
/>
);
}
@@ -7,14 +7,16 @@ export interface Props {
value: boolean; value: boolean;
onChange: (v: boolean) => void; onChange: (v: boolean) => void;
disabled?: boolean; disabled?: boolean;
className?: string;
} }
export default function InputBoolean({ export default function InputBoolean({
label, label,
value = false, value = false,
onChange, onChange,
disabled = false, disabled = false,
className,
}: Props) { }: Props) {
return <FormGroup> return <FormGroup className={className}>
<FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} /> <FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} />
</FormGroup> </FormGroup>
} }
@@ -0,0 +1,148 @@
import "./InputTime.css";
import { useState, useEffect, FC } from "react";
import TextField from '@mui/material/TextField';
import EditIcon from '@mui/icons-material/Edit';
import CloseIcon from "@mui/icons-material/Close";
import IconButton from "@mui/material/IconButton"
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { convertAutomationTimeToTimeObject, convertObjectToAutomationTimeString, milisecondsToObject } from "utils/time";
import { convertStringToAutomationTimeObject, convertAutomationTimeToTimeString } from 'utils/time';
import { prettyName } from "utils/formatting";
import FormControl from "@mui/material/FormControl";
import InputLabel from '@mui/material/InputLabel';
import Input from "@mui/material/Input";
import FormHelperText from '@mui/material/FormHelperText';
// constants
const fields: Array<keyof AutomationTimeObject> = [
'hours',
'minutes',
'seconds',
'milliseconds'
]
export interface Props {
label: string;
value?: AutomationTime;
onChange: (v?: AutomationTimeObject) => void;
}
export const InputTime: FC<Props> = (props) => {
// state
const [disabled, setDisabled] = useState(!props.value)
const [displayValue, setDisplayValue] = useState(convertAutomationTimeToTimeObject(props.value))
// process display input
const updateOne = (k: keyof AutomationTimeObject) => (v: string) => {
if (Number(v) < 0) {
setDisplayValue({
...displayValue,
[k]: 0
})
} else if (k === "hours") {
setDisplayValue({
...displayValue,
[k]: Number(v)
})
} else if (k === "minutes") {
let minutes = Number(v);
let { hours = 0 } = displayValue
if (minutes > 59) {
const additonalHours = Math.floor(minutes / 60)
hours += additonalHours
minutes = minutes - additonalHours * 60
}
setDisplayValue({
...displayValue,
minutes,
hours,
})
} else if (k === "seconds") {
let seconds = Number(v);
let { hours = 0, minutes = 0 } = displayValue
if (seconds > 59) {
const additonalHours = Math.floor(seconds / (60 * 60))
hours += additonalHours
seconds = seconds - additonalHours * 60
}
if (seconds > 59) {
const additionalMinutes = Math.floor(seconds / 60)
minutes += additionalMinutes
seconds = seconds - additionalMinutes * 60
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
})
} else if (k === "milliseconds") {
let milliseconds = Number(v);
let { hours = 0, minutes = 0, seconds = 0 } = displayValue
if (milliseconds > 1000) {
const additonalHours = Math.floor(milliseconds / (60 * 60 * 1000))
hours += additonalHours
milliseconds = milliseconds - additonalHours * 60 * 60 * 1000
}
if (milliseconds > 1000) {
const additionalMinutes = Math.floor(milliseconds / (60 * 1000))
minutes += additionalMinutes
milliseconds = milliseconds - additionalMinutes * 60 * 1000
}
if (milliseconds > 1000) {
const additionalSeconds = Math.floor(milliseconds / 1000)
seconds += additionalSeconds
milliseconds = milliseconds - additionalSeconds * 1000
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
milliseconds,
})
}
}
// effect
useEffect(() => {
if (disabled && !props.value) {
return
}
if (disabled) {
props.onChange(undefined)
} else {
const pVal = convertAutomationTimeToTimeString(props.value);
const cVal = convertObjectToAutomationTimeString(displayValue);
if (pVal !== cVal) {
props.onChange(displayValue)
}
}
}, [disabled, displayValue])
return <div className="input-time">
<InputLabel >{props.label}</InputLabel>
<div className="input-time--inner">
{fields.map(name =>
<TextField
key={name}
variant="filled"
label={prettyName(name)}
defaultValue="00"
InputProps={{
disabled,
type: "number",
title: prettyName(name),
}}
value={displayValue[name] ?? 0}
onChange={e => updateOne(name)(e.target.value)}
/>
)}
<IconButton onClick={() => setDisabled(!disabled)}>
{disabled ? <EditIcon /> : <CloseIcon />}
</IconButton>
</div>
</div>
}
@@ -32,5 +32,5 @@ export const Single = Template.bind({})
Single.args = { Single.args = {
...Single.args, ...Single.args,
multiple: false, multiple: false,
value: 'sensor.bathroom' value: 'sensor.humidity_bathroom'
} as any } as any
+9 -108
View File
@@ -1,117 +1,18 @@
import "./InputEntities.css";
import { FC } from "react"; import { FC } from "react";
import { useHADeviceRegistry } from 'haService'; import { useHADeviceRegistry } from 'haService';
import Autocomplete from '@mui/material/Autocomplete'; import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { EntityId } from 'types/automations/common';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
import { prettyName } from 'utils/formatting';
export type InputEntityProps = { export type InputDeviceProps = InputAutoCompletePropsBase & { multiple?: false };
label?: string,
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: EntityId;
multiple: true;
onChange: (v: string[]) => void;
})
export const InputDevice: FC<InputEntityProps> = props => { export const InputDevice: FC<InputDeviceProps> = props => {
// state // state
const dr = useHADeviceRegistry(); const dr = useHADeviceRegistry();
// processing of inputs return <InputAutoComplete
const options = dr.getOptions(); {...props}
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : []; label={props.label ?? "Device ID"}
getID={dr.getID}
// events getLabel={dr.getLabel}
const onChange = (_e: any, v: any) => { options={dr.getOptions()}
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>
}
/> />
} }
+9 -125
View File
@@ -1,138 +1,22 @@
import "./InputEntities.css";
import { FC } from "react"; import { FC } from "react";
import { useHAEntities } from 'haService'; import { useHAEntities } from 'haService';
import Autocomplete from '@mui/material/Autocomplete'; import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { prettyName } from "utils/formatting"; 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[], 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 => { export const InputEntity: FC<InputEntityProps> = props => {
// state // state
const entities = useHAEntities(); const entities = useHAEntities();
return <InputAutoComplete
// processing of inputs {...props}
const options = entities.getOptions(props.restrictToDomain); validateOption={v => entities.validateOptions(v, props.restrictToDomain)}
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : []; options={entities.getOptions(props.restrictToDomain)}
const errors = entities.validateOptions(value, props.restrictToDomain); getID={entities.getID}
getLabel={entities.getLabel}
// processing of errors
let helperText = <></>;
let error: boolean = false;
if (errors !== null) {
error = true
if (errors.length > 0) {
helperText = <Badge
className="input-entities--errors"
badgeContent={errors.length} color="error"
>
<ul title={errors.join(', and')}>{errors.map((msg, i) => <li key={i}>
{msg}
</li>)}</ul>
</Badge>
}
}
// events
const onChange = (_e: any, v: any) => {
const cleanValue: string[] = v === null ? [] :
Array.isArray(v) ? v.map(opt => {
if (typeof opt === 'string') {
return opt
}
return opt.id
}) : [v];
if (props.multiple) {
props.onChange(cleanValue);
} else {
props.onChange(cleanValue[cleanValue.length - 1])
}
}
return <Autocomplete
className="input-entities"
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={entities.getLabel}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase();
return opts.map(opt => {
let similarityScore = 0;
const eid = entities.getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
const name = entities.getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
return {
label: name,
id: eid,
domain: (typeof opt === 'string') ? '' : opt.domain,
similarityScore
}
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
return (a.similarityScore > b.similarityScore) ? 1 : -1
})
}}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''} 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 FormHelperText from '@mui/material/FormHelperText'; import InputLabel from "@mui/material/InputLabel";
import InputLabel from '@mui/material/InputLabel'; import MenuItem from "@mui/material/MenuItem";
import MenuItem from '@mui/material/MenuItem'; import FormControl from "@mui/material/FormControl";
import FormControl from '@mui/material/FormControl'; import Select from "@mui/material/Select";
import Select from '@mui/material/Select'; import { prettyName } from "utils/formatting";
import { ReactNode } from "react";
export interface Props<T extends string> { export type Props<T extends string | Object> = {
current: T; current?: T;
options: readonly T[]; options: readonly T[];
onChange: (n: T) => void; onChange: (n: T) => void;
label: string; label: string;
id?: string; id?: string;
className?: string; className?: string;
} prettyOptionLabels?: boolean;
export const InputList: FC<Props<any>> = ({ getKey?: (n: T) => string;
placeholder?: any;
title?: string;
helperText?: string;
endAdornment?: ReactNode;
};
export function InputList<T extends string | Object>({
current, current,
options, options,
onChange, onChange,
label, label,
id, id,
className, className,
}) => { prettyOptionLabels,
const invalidCurrent = current && !options.includes(current); getKey = String,
return <FormControl variant="filled" sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}> placeholder,
<InputLabel id="demo-simple-select-filled-label">{label}</InputLabel> title,
<Select helperText,
endAdornment,
}: Props<T>) {
const invalidCurrent =
current && !options.map(getKey).includes(getKey(current));
return (
<FormControl
className={className} className={className}
autoWidth
id={id}
value={current}
onChange={(e) => {
onChange(e.target.value)
}}
label={label}
variant="filled" variant="filled"
placeholder={label} sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}
error={invalidCurrent}
> >
{options.map((t, i) => ( <InputLabel>{label}</InputLabel>
<MenuItem <Select
key={i} title={title}
value={t} placeholder={placeholder ?? label}
> endAdornment={endAdornment}
{t} autoWidth
</MenuItem> id={id}
))} value={current ? getKey(current) : ""}
</Select> onChange={(e) => {
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText> const key = e.target.value;
</FormControl> const option = options.filter((opt) => getKey(opt) === key)[0];
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 Close from "@mui/icons-material/Close";
import { useInputNumberStyles } from "./styles"; import TextField from "@mui/material/TextField";
import IconButton from "@mui/material/IconButton";
import InputAdornment from "@mui/material/InputAdornment";
import Edit from "@mui/icons-material/Edit";
export interface Props { export interface Props {
label: string; label: string | JSX.Element;
value: number | undefined; value: number | undefined;
onChange: (v: number | undefined) => void; onChange: (v: number | undefined) => void;
className?: string; className?: string;
min?: number, min?: number;
max?: number, max?: number;
step?: number, step?: number;
unit?: string;
placeholder?: any;
required?: boolean;
} }
export default function InputNumber({ export default function InputNumber({
label, label,
value = undefined, value = undefined,
onChange, onChange,
className = "", className = "",
min, max, step, min,
max,
step,
unit,
placeholder,
required,
}: Props) { }: Props) {
const { classes } = useInputNumberStyles({}); const disabled = value === undefined || value === null;
return <InputWrapper className={className} label={label} labelSize={value !== undefined ? 'small' : 'normal'}> return (
<input <TextField
className={classes.input} variant="filled"
type="number" label={label}
value={value ?? ""} value={value}
onChange={e => { defaultValue={value}
e.preventDefault(); onChange={(e) => onChange(Number(e.target.value ?? 0))}
let v = Number(e.target.value); disabled={disabled}
if (max) { className={className}
v = Math.min(v, max) placeholder={placeholder}
} required={required}
if (min) { InputProps={{
v = Math.max(v, min) endAdornment: (
} <InputAdornment position="end">
onChange(v) {unit}
<IconButton onClick={() => onChange(disabled ? 0 : undefined)}>
{disabled ? <Edit /> : <Close />}
</IconButton>
</InputAdornment>
),
inputProps: {
min,
max,
type: "number",
step,
},
}} }}
step={step}
min={min}
max={max}
/> />
{value && <button className={classes.deleteIcon} onClick={() => onChange(undefined)}>X</button>} );
</InputWrapper>
} }
@@ -0,0 +1,36 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { InputService } from "./InputService";
export default {
title: 'Inputs/InputService',
component: InputService,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof InputService>;
const Template: ComponentStory<typeof InputService> = args => {
const [value, setValue] = useState(args.value)
return <Page>
<div style={{
maxWidth: 200
}}>
<InputService {...args} value={value as any} onChange={(v: any) => {
setValue(v)
args.onChange(v as any)
}} />
</div>
</Page>
}
export const Single = Template.bind({})
Single.args = {
...Single.args,
multiple: false,
value: ''
} as any
@@ -0,0 +1,19 @@
import { FC } from "react";
import { useHAServices } from 'haService';
import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
import { prettyName } from 'utils/formatting';
export type InputServiceProps = InputAutoCompletePropsBase & { multiple?: false };
export const InputService: FC<InputServiceProps> = props => {
const services = useHAServices();
return <InputAutoComplete
{...props}
label={props.label ?? "Service"}
options={services.getOptions()}
getID={services.getID}
getLabel={services.getLabel}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
/>
}
+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 { useToolTip } from "tooltip/context";
import TextField from '@mui/material/TextField'; import TextField from "@mui/material/TextField";
import InputWrapper from "./InputWrapper"; import InputWrapper from "./InputWrapper";
export interface Props { export interface Props {
textBoxFor?: string; textBoxFor?: string;
label: string; label: string | JSX.Element;
value: string; value: string;
onChange: (v: string) => void; onChange: (v: string) => void;
onEnter?: () => void; onEnter?: () => void;
additionalTooltipFilters?: Record<string, string>; additionalTooltipFilters?: Record<string, string>;
multiline?: boolean; multiline?: boolean;
maxRows?: number; maxRows?: number;
className?: string;
placeholder?: any;
title?: string;
helperText?: string;
endAdornment?: ReactNode;
required?: boolean;
} }
export default function InputText({ export default function InputText({
label, label,
title,
helperText,
textBoxFor, textBoxFor,
value = "", value = "",
onChange, onChange,
onEnter = () => { }, endAdornment,
onEnter = () => {},
additionalTooltipFilters = {}, additionalTooltipFilters = {},
multiline = false, multiline = false,
maxRows = 4, maxRows = 4,
children, children,
className,
placeholder,
required,
}: PropsWithChildren<Props>) { }: PropsWithChildren<Props>) {
const tooltip = useToolTip(); const tooltip = useToolTip();
const [isFocused, setIsFocused] = useState(false) const [isFocused, setIsFocused] = useState(false);
return <InputWrapper label=""> return (
<TextField multiline={multiline} maxRows={maxRows} fullWidth inputMode="text" variant="filled" focused={isFocused} label={label} value={value} <InputWrapper className={className} label="">
onKeyDown={e => { <TextField
if (e.key === 'Enter') { multiline={multiline}
onEnter(); maxRows={maxRows}
} fullWidth
}} inputMode="text"
onChange={e => { variant="filled"
e.preventDefault(); focused={isFocused}
onChange(e.target.value) label={label}
}} value={value}
onBlur={() => { title={title}
setIsFocused(false) helperText={helperText}
}} placeholder={placeholder}
onFocus={e => { InputProps={{
setIsFocused(true) endAdornment,
if (textBoxFor) { }}
tooltip.setFocus( required={required}
e.target.getBoundingClientRect(), onKeyDown={(e) => {
{ if (e.key === "Enter") {
searchObject: textBoxFor, onEnter();
searchText: value, }
filterObjects: additionalTooltipFilters, }}
}, onChange={(e) => {
onChange e.preventDefault();
) onChange(e.target.value);
} }}
}} onBlur={() => {
/> setIsFocused(false);
{children} }}
</InputWrapper> onFocus={(e) => {
setIsFocused(true);
if (textBoxFor) {
tooltip.setFocus(
e.target.getBoundingClientRect(),
{
searchObject: textBoxFor,
searchText: value,
filterObjects: additionalTooltipFilters,
},
onChange
);
}
}}
/>
{children}
</InputWrapper>
);
} }
@@ -0,0 +1,9 @@
.input-time>.input-time--inner {
display: flex;
gap: 0;
flex-direction: row;
}
.input-time>.input-time--inner>.MuiFormControl-root {
width: 4em;
}
@@ -3,7 +3,7 @@ import { Page } from "components/Page";
import { useState } from "react"; import { useState } from "react";
import { AutomationTime } from "types/automations/common"; import { AutomationTime } from "types/automations/common";
import InputTime from "./InputTime"; import { InputTime } from "./InputTime";
export default { export default {
title: 'Inputs/InputTime', title: 'Inputs/InputTime',
@@ -16,11 +16,19 @@ const Template: ComponentStory<typeof InputTime> = args => {
const [value, setValue] = useState<AutomationTime | undefined>(undefined); const [value, setValue] = useState<AutomationTime | undefined>(undefined);
return <Page> return <Page>
<InputTime {...args} value={value} onChange={setValue} /> <div style={{
padding: '1em'
}}>
<InputTime {...args} value={value} onChange={t => {
setValue(t)
args.onChange(t)
}} />
</div>
</Page> </Page>
} }
export const SimpleText = Template.bind({}) export const SimpleText = Template.bind({})
SimpleText.args = { SimpleText.args = {
label: "Time Stamp", label: "Time Stamp",
value: "10"
} }
+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 { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { milisecondsToObject } from "utils/time"; import { convertAutomationTimeToTimeObject, convertObjectToAutomationTimeString, convertAutomationTimeToTimeString } from 'utils/time';
import InputWrapper from "./InputWrapper"; import { prettyName } from "utils/formatting";
import { useInputTimeStyles } from "./styles";
import { convertStringToAutomationTimeObject } from 'utils/time';
// constants
const fields: Array<keyof AutomationTimeObject> = [
'hours',
'minutes',
'seconds',
'milliseconds'
]
export interface Props { export interface Props {
textBoxFor?: string;
label: string; label: string;
value?: AutomationTime; value?: AutomationTime;
onChange: (v?: AutomationTimeObject) => void; onChange: (v?: AutomationTimeObject) => void;
onEnter?: () => void; className?: string;
} }
export default function InputTime({ export const InputTime: FC<Props> = (props) => {
label,
textBoxFor,
value = {}, // state
onChange, const [disabled, setDisabled] = useState(!props.value)
onEnter = () => { }, const [displayValue, setDisplayValue] = useState(convertAutomationTimeToTimeObject(props.value))
children,
}: PropsWithChildren<Props>) { // process display input
let cleanValue = ''; const updateOne = (k: keyof AutomationTimeObject) => (v: string) => {
if (value) { if (Number(v) < 0) {
if (typeof value === 'string') { setDisplayValue({
value = convertStringToAutomationTimeObject(value); ...displayValue,
[k]: 0
})
} else if (k === "hours") {
setDisplayValue({
...displayValue,
[k]: Number(v)
})
} else if (k === "minutes") {
let minutes = Number(v);
let { hours = 0 } = displayValue
if (minutes > 59) {
const additonalHours = Math.floor(minutes / 60)
hours += additonalHours
minutes = minutes - additonalHours * 60
}
setDisplayValue({
...displayValue,
minutes,
hours,
})
} else if (k === "seconds") {
let seconds = Number(v);
let { hours = 0, minutes = 0 } = displayValue
if (seconds > 59) {
const additonalHours = Math.floor(seconds / (60 * 60))
hours += additonalHours
seconds = seconds - additonalHours * 60
}
if (seconds > 59) {
const additionalMinutes = Math.floor(seconds / 60)
minutes += additionalMinutes
seconds = seconds - additionalMinutes * 60
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
})
} else if (k === "milliseconds") {
let milliseconds = Number(v);
let { hours = 0, minutes = 0, seconds = 0 } = displayValue
if (milliseconds > 1000) {
const additonalHours = Math.floor(milliseconds / (60 * 60 * 1000))
hours += additonalHours
milliseconds = milliseconds - additonalHours * 60 * 60 * 1000
}
if (milliseconds > 1000) {
const additionalMinutes = Math.floor(milliseconds / (60 * 1000))
minutes += additionalMinutes
milliseconds = milliseconds - additionalMinutes * 60 * 1000
}
if (milliseconds > 1000) {
const additionalSeconds = Math.floor(milliseconds / 1000)
seconds += additionalSeconds
milliseconds = milliseconds - additionalSeconds * 1000
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
milliseconds,
})
} }
const {
hours = 0,
minutes = 0,
seconds = 0,
milliseconds = 0,
} = value;
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
} }
const { classes } = useInputTimeStyles({});
const [isFocused, setIsFocused] = useState(false)
return <InputWrapper className={classes.wrapper} label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}> // effect
<input useEffect(() => {
className={classes.input} if (disabled && !props.value) {
type="time" return
step={0.001} }
value={cleanValue} if (disabled) {
onKeyDown={e => { props.onChange(undefined)
if (e.key === 'Enter') { } else {
onEnter(); const pVal = convertAutomationTimeToTimeString(props.value);
} const cVal = convertObjectToAutomationTimeString(displayValue);
}} if (pVal !== cVal) {
onChange={e => { props.onChange(displayValue)
e.preventDefault(); }
onChange(milisecondsToObject(e.target.valueAsNumber)) }
}} // eslint-disable-next-line
onBlur={e => { }, [disabled, displayValue])
setIsFocused(false)
}}
/> return <div className={["input-time", props.className ?? ""].join(" ")}>
<button onClick={() => onChange()} className={classes.cancel}>X</button> {/* <InputLabel >{props.label}</InputLabel> */}
{children} <div className="input-time--inner">
</InputWrapper> {fields.map(name =>
<TextField
key={name}
variant="filled"
label={prettyName(name)}
defaultValue="00"
InputProps={{
disabled,
type: "number",
title: prettyName(name),
}}
value={displayValue[name] ?? 0}
onChange={e => updateOne(name)(e.target.value)}
/>
)}
<IconButton onClick={() => setDisabled(!disabled)}>
{disabled ? <EditIcon /> : <CloseIcon />}
</IconButton>
</div>
</div>
} }
+4 -2
View File
@@ -11,12 +11,14 @@ export interface Props<T extends {}> {
value: T; value: T;
onChange: (v: T) => void; onChange: (v: T) => void;
error?: JSX.Element | string, error?: JSX.Element | string,
className?: string;
} }
export default function InputYaml<T>({ export default function InputYaml<T extends {}>({
label, label,
error: incmError, error: incmError,
value = {} as any, value = {} as any,
onChange, onChange,
className,
}: Props<T>) { }: Props<T>) {
const [{ text, error }, setState] = useState<{ const [{ text, error }, setState] = useState<{
text: string, text: string,
@@ -50,7 +52,7 @@ export default function InputYaml<T>({
} }
} }
}, [text], 1000) }, [text], 1000)
return <InputWrapper label={label} error={error}> return <InputWrapper className={className} label={label} error={error}>
<CodeMirror <CodeMirror
theme={"dark"} theme={"dark"}
value={text} value={text}
+5 -5
View File
@@ -13,7 +13,7 @@ const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
justifyContent: 'center', justifyContent: 'center',
alignItems: 'center', alignItems: 'center',
zIndex: open ? 10 : -1, zIndex: open ? 10 : -1,
position: 'absolute', position: 'fixed',
height: '100vh', height: '100vh',
width: '100vw', width: '100vw',
top: 0, top: 0,
@@ -30,10 +30,10 @@ const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
}, },
inner: { inner: {
zIndex: 10, zIndex: 10,
maxWidth: '80%', maxWidth: '80vw',
maxHeight: '90%', maxHeight: '90vh',
minHeight: 'fit-content', minHeight: 'min-content',
minWidth: 'fit-content', minWidth: '100px',
padding: '15px', padding: '15px',
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
@@ -1,8 +1,7 @@
import InputText from "components/Inputs/InputText"; import { InputService } from "components/Inputs/InputService";
import InputYaml from 'components/Inputs/InputYaml'; import { ServiceEditor } from "components/ServiceEditor";
import { ServiceAction } from "types/automations/actions"; import { ServiceAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager'; import { OptionManager, updateActionData } from "./OptionManager";
export const ActionCallServiceState: OptionManager<ServiceAction> = { export const ActionCallServiceState: OptionManager<ServiceAction> = {
defaultState: () => ({ defaultState: () => ({
@@ -10,31 +9,34 @@ export const ActionCallServiceState: OptionManager<ServiceAction> = {
target: {}, target: {},
data: {}, data: {},
}), }),
isReady: ({ isReady: ({ service }) => service !== "",
service, Component: ({ state, setState, services }) => {
}) => (
service !== ''
),
renderOptionList: (state, setState) => {
const { service, target, data } = state; const { service, target, data } = state;
const update = updateActionData(state, setState); const update = updateActionData(state, setState);
return <> const serviceOption = services.getOption(service);
<InputText return (
textBoxFor="service" <>
label="Service" <InputService
value={service} value={service}
onChange={service => update({ service })} onChange={(service: string | null) =>
/> update({ service: service ?? "" })
<InputYaml }
label="Target" />
value={target} {serviceOption && (
onChange={target => update({ target })} <ServiceEditor
/> key={service}
<InputYaml serviceId={service}
label="Data" service={serviceOption}
value={data} data={{ target, field: data }}
onChange={data => update({ data })} onUpdate={({ target, field }) =>
/> update({
</> target,
} data: field,
} })
}
/>
)}
</>
);
},
};
@@ -0,0 +1,33 @@
.node-editor--action-wait {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.node-editor--action-wait .for {
flex: 2;
}
.node-editor--action-wait .for .input-time--inner {
justify-content: center;
}
.node-editor--action-wait .template {
margin: 0;
flex: 2;
}
.node-editor--action-wait .triggers {
width: 100%;
}
.node-editor--action-wait .wait-type {
flex: 1;
}
.node-editor--action-wait .wait-options {
width: 100%;
display: flex;
justify-content: space-evenly;
align-items: center;
}
@@ -1,41 +1,109 @@
import "./ActionWait.css";
import InputBoolean from "components/Inputs/InputBoolean"; import InputBoolean from "components/Inputs/InputBoolean";
import { InputList } from "components/Inputs/InputList";
import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import { WaitAction } from "types/automations/actions"; import { InputTime } from "components/Inputs/InputTime";
import { useState } from "react";
import { DelayAction, WaitAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager'; import { OptionManager, updateActionData } from './OptionManager';
import InputYaml from "components/Inputs/InputYaml";
type ThisAction = WaitAction | DelayAction;
type Option = 'delay' | 'template' | 'trigger'
const getCurrentOption = (node: ThisAction): Option => {
if ('delay' in node) {
return 'delay'
} else {
return 'template'
}
}
export const ActionWaitState: OptionManager<WaitAction> = { export const ActionWaitState: OptionManager<ThisAction> = {
defaultState: () => ({ defaultState: () => ({
alias: "Wait", delay: "",
wait_template: "",
// timeout: 0,
continue_on_timeout: false,
}), }),
isReady: ({ isReady: () => true,
alias, wait_template Component: ({ state, setState }) => {
}) => ( // state
alias !== '' &&
wait_template !== ""
),
renderOptionList: (state, setState) => {
const update = updateActionData(state, setState); const update = updateActionData(state, setState);
return <> const [current, _setCurrent] = useState(getCurrentOption(state));
<InputText const setCurrent = (opt: Option) => {
textBoxFor="template" const base: any = {
label="Template" alias: state.alias,
value={state.wait_template} variables: state.variables,
onChange={wait_template => update({ wait_template })} }
/> if (opt === 'delay') {
{/* <InputNumber setState({
label="Timeout" ...base,
value={state.timeout ?? 0} delay: (state as any).delay ?? "",
onChange={(timeout = 0) => update({ timeout })} })
/> */} } else {
<InputBoolean base.timeout = (state as any).timeout
label="Continue on Timeout" base.continue_on_timeout = (state as any).continue_on_timeout
value={state.continue_on_timeout ?? false} if (opt === 'template') {
onChange={continue_on_timeout => update({ continue_on_timeout })} setState({
/> ...base,
</> wait_template: (state as any).wait_template ?? "",
})
} else {
setState({
...base,
wait_for_trigger: (state as any).wait_for_trigger ?? "",
})
}
}
_setCurrent(opt)
}
// determine options
let option: JSX.Element = <></>;
if (current === "delay") {
option = <>
<InputTime className="for" label="for" value={(state as any).delay} onChange={delay => update({ delay })} />
</>
} else if (current === 'template') {
state = state as WaitAction;
option = <>
<InputText
label="Template"
className="template"
value={state.wait_template ?? ""}
onChange={wait_template => update({ wait_template })}
/>
</>
} else if (current === 'trigger') {
state = state as WaitAction;
option = <>
<InputYaml
className="triggers"
label="Triggers"
value={state.wait_for_trigger ?? []}
onChange={wait_for_trigger => update({ wait_for_trigger })}
/>
</>
}
// render
return <div className="node-editor--action-wait">
<InputList
className="wait-type"
label="Wait Type" prettyOptionLabels
options={["template", 'trigger', "delay"]}
current={current} onChange={setCurrent} />
{option}
{current !== 'delay' ? <div className="wait-options">
<InputNumber
label="Timeout"
value={(state as any).timeout ? Number((state as any).timeout) : undefined}
onChange={timeout => update({ timeout: timeout === undefined ? undefined : String(timeout) })}
/>
<InputBoolean
label="Continue on Timeout"
value={(state as any).continue_on_timeout ?? false}
onChange={continue_on_timeout => update({ continue_on_timeout })}
/>
</div> : <></>}
</div>
} }
} }
@@ -1,29 +1,47 @@
import { HAEntitiesState } from 'haService'; import { HAEntitiesState, HAServicesState } from 'haService';
import { FC } from 'react';
import { AutomationAction } from 'types/automations/actions'; import { AutomationAction } from 'types/automations/actions';
import { AutomationCondition } from 'types/automations/conditions'; import { AutomationCondition } from 'types/automations/conditions';
export interface OptionManager<T> { export type OptionManager<T> = {
defaultState(): T; defaultState(): T;
isReady(s: T): boolean; isReady(s: T): boolean;
} & ({
renderOptionList(s: T, set: (s: T) => void, entities: HAEntitiesState): JSX.Element; renderOptionList(s: T, set: (s: T) => void, entities: HAEntitiesState): JSX.Element;
} } | {
Component: FC<{
state: T,
setState: (s: T) => void,
entities: HAEntitiesState,
services: HAServicesState,
}>
})
export const cleanUpUndefined = (data: Record<string, any>): any => {
const clean: any = {};
Object.keys(data).forEach(k => {
if ((data[k] !== undefined) && (data[k] !== null)) {
clean[k] = data[k]
}
})
return clean;
}
export const updateConditionData = <T extends AutomationCondition>( export const updateConditionData = <T extends AutomationCondition>(
setState: (s: T) => void setState: (s: T) => void
) => ( ) => (
state: T, state: T,
data: Partial<T>, data: Partial<T>,
) => setState({ ) => setState(cleanUpUndefined({
...state, ...state,
...data, ...data,
}) }))
export const updateActionData = <T extends AutomationAction>( export const updateActionData = <T extends AutomationAction>(
state: T, state: T,
setState: (s: T) => void setState: (s: T) => void
) => ( ) => (
data: Partial<T>, data: Partial<T>,
) => setState({ ) => setState(cleanUpUndefined({
...state, ...state,
...data, ...data,
}) }))
@@ -3,8 +3,7 @@ import { AutomationTriggerNumericState } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText'; import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputEntities'; import { InputEntity } from 'components/Inputs/InputEntities';
import InputNumber from 'components/Inputs/InputNumber'; import InputNumber from 'components/Inputs/InputNumber';
import InputTime from 'components/Inputs/InputTime'; import { InputTime } from 'components/Inputs/InputTime'; import InputYaml from 'components/Inputs/InputYaml';
import InputYaml from 'components/Inputs/InputYaml';
export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> = { export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> = {
@@ -2,7 +2,7 @@ import { OptionManager } from './OptionManager';
import { AutomationTriggerState } from 'types/automations/triggers'; import { AutomationTriggerState } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText'; import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputEntities'; import { InputEntity } from 'components/Inputs/InputEntities';
import InputTime from 'components/Inputs/InputTime'; import { InputTime } from 'components/Inputs/InputTime';
export const TriggerState: OptionManager<AutomationTriggerState> = { export const TriggerState: OptionManager<AutomationTriggerState> = {
@@ -1,7 +1,7 @@
import { OptionManager } from './OptionManager'; import { OptionManager } from './OptionManager';
import { AutomationTriggerTemplate } from 'types/automations/triggers'; import { AutomationTriggerTemplate } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText'; import InputText from 'components/Inputs/InputText';
import InputTime from 'components/Inputs/InputTime'; import { InputTime } from 'components/Inputs/InputTime';
export const TriggerTemplate: OptionManager<AutomationTriggerTemplate> = { export const TriggerTemplate: OptionManager<AutomationTriggerTemplate> = {
@@ -1,6 +1,6 @@
import { OptionManager } from './OptionManager'; import { OptionManager } from './OptionManager';
import { AutomationTriggerTime } from 'types/automations/triggers'; import { AutomationTriggerTime } from 'types/automations/triggers';
import InputTime from 'components/Inputs/InputTime'; import { InputTime } from 'components/Inputs/InputTime';
import { convertObjectToAutomationTimeString } from 'utils/time'; import { convertObjectToAutomationTimeString } from 'utils/time';
@@ -40,6 +40,8 @@ export const getOptionManager = <T extends AutomationNodeTypes>(
return ActionCallServiceState; return ActionCallServiceState;
case "wait": case "wait":
return ActionWaitState; return ActionWaitState;
case "delay":
return ActionWaitState;
} }
} }
if (nodeType === 'condition') { if (nodeType === 'condition') {
@@ -1,44 +1,61 @@
import { Dispatch, SetStateAction, useEffect, useState } from 'react'; import { Dispatch, SetStateAction, useEffect, useState } from "react";
import { AutomationNode, AutomationNodeTypes } from 'types/automations'; import { AutomationNode, AutomationNodeTypes } from "types/automations";
import { AutomationNodeSubtype } from 'types/automations'; import { AutomationNodeSubtype } from "types/automations";
import { getOptionManager } from './getOptionManager'; import { getOptionManager } from "./getOptionManager";
import { getNodeSubType, getSubTypeList, validateNode } from 'utils/automations'; import {
import InputYaml from 'components/Inputs/InputYaml'; getNodeSubType,
import InputText from 'components/Inputs/InputText'; getSubTypeList,
import { getDescriptionFromAutomationNode } from 'utils/formatting'; validateNode,
import { useHAEntities } from 'haService'; } from "utils/automations";
import { Generic } from './Generic'; import InputYaml from "components/Inputs/InputYaml";
import { getNodeTypeAndValidate } from '../../../utils/automations'; 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, allowedTypes: AutomationNodeTypes[], uState: UseState = useState) => { export const useEditorNodeState = (
originalNode: AutomationNode,
isErrored: boolean,
allowedTypes: AutomationNodeTypes[],
uState: UseState = useState
) => {
// state // state
const [allState, setAllState] = uState({ const [allState, setAllState] = uState({
yamlMode: false, yamlMode: false,
isModified: false, isModified: false,
...computeInvalidYaml(originalNode, allowedTypes) ...computeInvalidYaml(originalNode, allowedTypes),
}); });
const entities = useHAEntities(); const { entities, namer, services } = useHA();
// aliases // aliases
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState; const {
node: currentNode,
isModified,
yamlMode,
invalidManualYaml,
} = allState;
// effects // effects
useEffect(() => { useEffect(() => {
setAllState({ ...allState, node: originalNode, isModified: false, }) setAllState({ ...allState, node: originalNode, isModified: false });
// eslint-disable-next-line // eslint-disable-next-line
}, [originalNode]) }, [originalNode]);
// function aliases // function aliases
const setState = (node: AutomationNode) => setAllState(({ const setState = (node: AutomationNode) =>
...allState, node, setAllState({
isModified: JSON.stringify(node) !== JSON.stringify(originalNode), ...allState,
})); node,
const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, }); isModified: JSON.stringify(node) !== JSON.stringify(originalNode),
});
const setYamlMode = (yamlMode: boolean) =>
setAllState({ ...allState, yamlMode });
const setStateForManualYaml = (yaml: any) => { const setStateForManualYaml = (yaml: any) => {
setAllState({ setAllState({
...allState, ...allState,
...computeInvalidYaml(yaml, allowedTypes) ...computeInvalidYaml(yaml, allowedTypes),
}) });
} };
// value aliases // value aliases
const { const {
originalNodeType, originalNodeType,
@@ -47,7 +64,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
subType, subType,
subTypes, subTypes,
optionManager, optionManager,
} = createData(originalNode, currentNode, allowedTypes) } = createData(originalNode, currentNode, allowedTypes);
// publuc // publuc
return { return {
nodeType, nodeType,
@@ -59,84 +76,119 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
isErrored: allState.isErrored, isErrored: allState.isErrored,
get prettyNodeType() { get prettyNodeType() {
if (nodeType) { if (nodeType) {
return `${nodeType.slice(0, 1).toUpperCase()}${nodeType.slice(1)} Type` return `${nodeType.slice(0, 1).toUpperCase()}${nodeType.slice(1)} Type`;
} else { } else {
return 'n/a' return "n/a";
} }
}, },
get yamlMode() { get yamlMode() {
return allState.isErrored || yamlMode return allState.isErrored || yamlMode;
}, },
get data() { get data() {
return currentNode return currentNode;
},
setEnabled(enabled: boolean) {
setState({
...currentNode,
enabled,
});
}, },
renderOptionList() { renderOptionList() {
console.log('rendering option list') let aliasEditor = <></>;
let aliasEditor = <></> if (nodeType === "trigger") {
if (nodeType === 'trigger') { aliasEditor = (
aliasEditor = <InputText <InputText
key="alias" key="alias"
label="Trigger ID" label="Trigger ID"
value={(allState.node as any).id} value={(allState.node as any).id}
onChange={id => setState({ onChange={(id) =>
...allState.node, setState({
id ...allState.node,
} as any)} id,
/> } as any)
}
/>
);
} }
if (nodeType === 'action') { if (nodeType === "action") {
aliasEditor = <InputText aliasEditor = (
key="alias" <InputText
label="Alias" key="alias"
value={getDescriptionFromAutomationNode(allState.node)} label="Alias"
onChange={alias => setState({ value={getDescriptionFromAutomationNode(allState.node, namer)}
...allState.node, onChange={(alias) =>
alias setState({
} as any)} ...allState.node,
/> alias,
} as any)
}
/>
);
} }
if (yamlMode || allState.isErrored) { if (yamlMode || allState.isErrored) {
return <> return (
{aliasEditor} <>
<InputYaml {aliasEditor}
label='' <InputYaml
value={currentNode} label=""
onChange={setStateForManualYaml} value={currentNode}
error={invalidManualYaml} onChange={setStateForManualYaml}
/> error={invalidManualYaml}
</> />
</>
);
} }
return <> return (
{aliasEditor} <>
{optionManager.renderOptionList(currentNode, setState, entities)} {aliasEditor}
</>; {"renderOptionList" in optionManager ? (
optionManager.renderOptionList(currentNode, setState, entities)
) : (
<optionManager.Component
state={currentNode}
setState={setState}
entities={entities}
services={services}
/>
)}
</>
);
}, },
isReady() { isReady() {
return optionManager.isReady(currentNode); return optionManager.isReady(currentNode);
}, },
setNodeType(newType: AutomationNodeTypes) { setNodeType(newType: AutomationNodeTypes) {
if (newType === originalNodeType) { if (newType === originalNodeType) {
setState(originalNode) setState(originalNode);
} else { } else {
setState(getOptionManager(newType, getSubTypeList(newType)[0]).defaultState()) setState(
getOptionManager(newType, getSubTypeList(newType)[0]).defaultState()
);
} }
}, },
setSubType(newSubType: AutomationNodeSubtype) { setSubType(newSubType: AutomationNodeSubtype) {
if (newSubType === originalNodeSubType) { if (newSubType === originalNodeSubType) {
setState(originalNode) setState(originalNode);
} else { } else {
if (nodeType) { if (nodeType) {
setState(getOptionManager(nodeType, newSubType as any).defaultState()) setState(
getOptionManager(nodeType, newSubType as any).defaultState()
);
} else { } else {
setState(getOptionManager(allowedTypes[0], newSubType as any).defaultState()) setState(
getOptionManager(allowedTypes[0], newSubType as any).defaultState()
);
} }
} }
} },
} };
} };
const createData = (
const createData = (originalNode: AutomationNode, currentNode: AutomationNode, allowedTypes: AutomationNodeTypes[]) => { originalNode: AutomationNode,
currentNode: AutomationNode,
allowedTypes: AutomationNodeTypes[]
) => {
let originalNodeType: AutomationNodeTypes = allowedTypes[0]; let originalNodeType: AutomationNodeTypes = allowedTypes[0];
let originalNodeSubType: AutomationNodeSubtype | null = null; let originalNodeSubType: AutomationNodeSubtype | null = null;
let nodeType: AutomationNodeTypes = originalNodeType; let nodeType: AutomationNodeTypes = originalNodeType;
@@ -148,15 +200,15 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode, a
originalNodeType = getNodeTypeAndValidate(originalNode, allowedTypes); originalNodeType = getNodeTypeAndValidate(originalNode, allowedTypes);
originalNodeSubType = getNodeSubType(originalNode); originalNodeSubType = getNodeSubType(originalNode);
} catch (err) { } catch (err) {
console.error(`ORIGINAL NODE ERROR ${JSON.stringify(originalNode)}`) console.error(`ORIGINAL NODE ERROR ${JSON.stringify(originalNode)}`);
} }
try { try {
nodeType = getNodeTypeAndValidate(currentNode, allowedTypes); nodeType = getNodeTypeAndValidate(currentNode, allowedTypes);
subType = getNodeSubType(currentNode); subType = getNodeSubType(currentNode);
subTypes = getSubTypeList(nodeType) subTypes = getSubTypeList(nodeType);
optionManager = getOptionManager(nodeType, subType as any); optionManager = getOptionManager(nodeType, subType as any);
} catch (err) { } catch (err) {
console.error(`CURRENT NODE ERROR ${JSON.stringify(currentNode)}`) console.error(`CURRENT NODE ERROR ${JSON.stringify(currentNode)}`);
} }
return { return {
originalNodeType, originalNodeType,
@@ -165,27 +217,34 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode, a
subType, subType,
subTypes, subTypes,
optionManager, optionManager,
} };
} };
const computeInvalidYaml = (node: AutomationNode, allowedNodeTypes: AutomationNodeTypes[]) => { const computeInvalidYaml = (
node: AutomationNode,
allowedNodeTypes: AutomationNodeTypes[]
) => {
const errors = validateNode(node, allowedNodeTypes); const errors = validateNode(node, allowedNodeTypes);
if (errors) { if (errors) {
console.log({ errors }) console.log({ errors });
return { return {
node, node,
isErrored: true, isErrored: true,
invalidManualYaml: <ul key={'error'} className="node-editor--error"> invalidManualYaml: (
{errors.map(({ message, path }, i) => <li key={i}> <ul key={"error"} className="node-editor--error">
<b>{path}</b>: {message} {errors.map(({ message, path }, i) => (
</li>)} <li key={i}>
</ul> <b>{path}</b>: {message}
} </li>
))}
</ul>
),
};
} else { } else {
return { return {
node, node,
isErrored: false, isErrored: false,
invalidManualYaml: <></> invalidManualYaml: <></>,
} };
} }
} };
@@ -8,6 +8,14 @@
margin-top: 0.5em; 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 { .node-editor--root.modded {
border: 1px solid var(--change); border: 1px solid var(--change);
border-radius: 5px; border-radius: 5px;
@@ -63,4 +71,20 @@
align-items: flex-start; align-items: flex-start;
padding: 0 0.5em 0 1.5em; padding: 0 0.5em 0 1.5em;
margin: 0; 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> </Modal>
</Page> </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": "",
},
}
+10 -2
View File
@@ -43,7 +43,12 @@ export const NodeEditor: FC<NodeEditorProps> = ({
// events // events
onFlags(isReady, isModified); onFlags(isReady, isModified);
// render // 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">
<div className="node-editor--body-title"> <div className="node-editor--body-title">
{allowedTypes.length > 1 ? <InputList {allowedTypes.length > 1 ? <InputList
@@ -58,7 +63,10 @@ export const NodeEditor: FC<NodeEditorProps> = ({
options={state.subTypes} options={state.subTypes}
onChange={state.setSubType} 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> </div>
{state.renderOptionList()} {state.renderOptionList()}
</div> </div>
@@ -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>
};
+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 { entitiesColl, servicesColl } from "home-assistant-js-websocket"
import { Namer } from "utils/formatting";
import { deviceRegistryColl } from "./DeviceRegistry"; import { deviceRegistryColl } from "./DeviceRegistry";
import { entityRegistryColl } from "./EntityRegistry"; import { entityRegistryColl } from "./EntityRegistry";
import { DeviceRegistryItem } from "./types"; import { DeviceRegistryItem } from "./types";
import { useHassCollection } from "./useHassCollection" 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, id: string,
label: string, label: string,
} & T) } & T
export type Option<T = {}> = string | BaseOption<T>;
export type EntityOption = Option<{ domain: string; }> export type EntityOption = Option<{ domain: string; }>
export type HAEntitiesState = ReturnType<typeof useHAEntities>; export type HAEntitiesState = ReturnType<typeof useHAEntities>;
export const 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 = () => { export const useHAServices = () => {
const services = useHassCollection(servicesColl); 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 }>; export type DeviceRegistryOption = Option<{ manufacturer: string }>;
@@ -120,4 +192,76 @@ export const useHAEntityRegistry = () => {
const dr = useHassCollection(entityRegistryColl) const dr = useHassCollection(entityRegistryColl)
return dr 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>
);
};
+2 -1
View File
@@ -1,5 +1,4 @@
import { AutomationSequenceNode } from "."; import { AutomationSequenceNode } from ".";
import { AutomationTime } from "./common";
import { AutomationCondition } from "./conditions"; import { AutomationCondition } from "./conditions";
import * as v from "types/validators/actions"; import * as v from "types/validators/actions";
import * as st from 'superstruct'; import * as st from 'superstruct';
@@ -15,6 +14,7 @@ export type RepeatAction = AutomationActionNodeBase<{
} }
}> }>
export type WaitAction = st.Infer<typeof v.WaitAction>; 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 FireEventAction = st.Infer<typeof v.FireEventAction>;
export type DeviceAction = st.Infer<typeof v.DeviceAction>; export type DeviceAction = st.Infer<typeof v.DeviceAction>;
export type ChooseAction = AutomationActionNodeBase<{ export type ChooseAction = AutomationActionNodeBase<{
@@ -28,6 +28,7 @@ export type AutomationAction =
| ServiceAction | ServiceAction
| RepeatAction | RepeatAction
| WaitAction | WaitAction
| DelayAction
| FireEventAction | FireEventAction
| DeviceAction | DeviceAction
| ChooseAction | ChooseAction
@@ -3,6 +3,7 @@ import * as st from 'superstruct';
import * as v from "types/validators/conditions"; import * as v from "types/validators/conditions";
type AutomationConditionNodeBase<Name extends String, Data extends Object> = { type AutomationConditionNodeBase<Name extends String, Data extends Object> = {
condition: Name; condition: Name;
enabled?: boolean;
} & Data; } & Data;
export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', { export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', {
conditions: AutomationCondition[]; conditions: AutomationCondition[];
+11 -1
View File
@@ -1,10 +1,12 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationTime } from './common'; import { AutomationTime } from './common';
import { AutomationTrigger } from './triggers';
export const AutomationActionNodeBase = st.type({ export const AutomationActionNodeBase = st.type({
alias: st.optional(st.string()), alias: st.optional(st.string()),
variables: st.optional(st.record(st.string(), st.any())), variables: st.optional(st.record(st.string(), st.any())),
enabled: st.optional(st.boolean())
}) })
export const ServiceAction = st.intersection([ export const ServiceAction = st.intersection([
@@ -29,9 +31,17 @@ export const RepeatAction = st.intersection([
export const WaitAction = st.intersection([ export const WaitAction = st.intersection([
AutomationActionNodeBase, AutomationActionNodeBase,
st.type({ st.type({
wait_template: st.string(),
timeout: st.optional(AutomationTime), timeout: st.optional(AutomationTime),
continue_on_timeout: st.optional(st.boolean()), continue_on_timeout: st.optional(st.boolean()),
wait_template: st.optional(st.string()),
wait_for_trigger: st.optional(st.array(AutomationTrigger)),
}),
]);
export const DelayAction = st.intersection([
AutomationActionNodeBase,
st.type({
delay: AutomationTime
}) })
]); ]);
+16 -2
View File
@@ -17,10 +17,24 @@ export const AutomationTimeString = st.refine(st.string(), 'TimeString', (v, c)
for (let i = 0; i < bits.length; i++) { for (let i = 0; i < bits.length; i++) {
const b = bits[i]; const b = bits[i];
const num = Number(b); const num = Number(b);
if (!Number.isInteger(num) || (num < 0) || (num > 23)) { if (Number.isInteger(num)) {
let max = 23;
if (i > 0) {
max = 59;
}
if ((num < 0) || (num > max)) {
return {
"branch": c.branch,
"message": `Time string should contain only positive numbers between 0-${max} as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string`,
"path": c.path.concat(
bits.slice(0, i)
).concat([`<<${b}>>`])
}
}
} else {
return { return {
"branch": c.branch, "branch": c.branch,
"message": "Time string should contain only positive numbers between 0-23 as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string", "message": `Time string should contain only positive numbers as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string`,
"path": c.path.concat( "path": c.path.concat(
bits.slice(0, i) bits.slice(0, i)
).concat([`<<${b}>>`]) ).concat([`<<${b}>>`])
+3 -1
View File
@@ -2,7 +2,9 @@ import * as st from 'superstruct'
import { AutomationTime, EntityId } from './common'; import { AutomationTime, EntityId } from './common';
export const AutomationConditionNodeBase = st.type({}); export const AutomationConditionNodeBase = st.type({
enabled: st.optional(st.boolean())
});
export const LogicCondition = st.intersection([ export const LogicCondition = st.intersection([
AutomationConditionNodeBase, AutomationConditionNodeBase,
st.type({ st.type({
+8 -3
View File
@@ -3,9 +3,9 @@ import { AutomationNode, AutomationNodeMapping, AutomationNodeSubtype, Automatio
import { AutomationTrigger, TriggerType } from 'types/automations/triggers'; import { AutomationTrigger, TriggerType } from 'types/automations/triggers';
import { MiniFailure } from "types/validators/helper"; import { MiniFailure } from "types/validators/helper";
import { getFailures } from '../types/validators/helper'; import { getFailures } from '../types/validators/helper';
import { Struct } from "superstruct";
import { ActionType } from "types/automations/actions"; import { ActionType } from "types/automations/actions";
import { ConditionType } from "types/automations/conditions"; import { ConditionType } from "types/automations/conditions";
import * as st from 'superstruct';
export const getNodeTypeAndValidate = (node: AutomationNode, allowedTypes: AutomationNodeTypes[]) => { export const getNodeTypeAndValidate = (node: AutomationNode, allowedTypes: AutomationNodeTypes[]) => {
const nodeType = getNodeType(node); const nodeType = getNodeType(node);
@@ -104,7 +104,7 @@ export const getNodeSubType = <T extends AutomationNodeTypes>(
return 'service' as any return 'service' as any
} else if ('repeat' in node) { } else if ('repeat' in node) {
return 'repeat' as any return 'repeat' as any
} else if ('wait_template' in node) { } else if (('wait_template' in node) || ('wait_for_trigger' in node)) {
return 'wait' as any return 'wait' as any
} else if ('event' in node) { } else if ('event' in node) {
return 'event' as any return 'event' as any
@@ -112,6 +112,8 @@ export const getNodeSubType = <T extends AutomationNodeTypes>(
return 'device' as any return 'device' as any
} else if ('choose' in node) { } else if ('choose' in node) {
return 'choose' as any return 'choose' as any
} else if ('delay' in node) {
return 'wait' as any
} else { } else {
throw new Error("Invalid node type!") throw new Error("Invalid node type!")
} }
@@ -138,7 +140,10 @@ const ActionValidators: Record<ActionType, any> = {
"event": v.actions.FireEventAction, "event": v.actions.FireEventAction,
"repeat": v.actions.RepeatAction, "repeat": v.actions.RepeatAction,
"service": v.actions.ServiceAction, "service": v.actions.ServiceAction,
"wait": v.actions.WaitAction, "wait": st.union([
v.actions.DelayAction,
v.actions.WaitAction
]),
} }
const ConditionValidators: Record<ConditionType, any> = { const ConditionValidators: Record<ConditionType, any> = {
+35 -20
View File
@@ -1,6 +1,21 @@
import { convertTimeToString, getDescriptionFromAutomationNode, prettyName } from "./formatting"; import { convertTimeToString, getDescriptionFromAutomationNode, Namer, prettyName } from "./formatting";
const dummyNamer: Namer = {
getDeviceName(device_id) {
return device_id
},
getServiceName(service) {
return service
},
getEntityName(entity_id, maxEntities = 1) {
if (Array.isArray(entity_id)) {
return entity_id.slice(0, maxEntities).join(' and ')
} else {
return entity_id
}
},
}
test('converting time to a string', () => { test('converting time to a string', () => {
expect(convertTimeToString({ hours: 1 })).toEqual('01:00:00:00') expect(convertTimeToString({ hours: 1 })).toEqual('01:00:00:00')
expect(convertTimeToString({ hours: 1, minutes: 5 })).toEqual('01:05:00:00') expect(convertTimeToString({ hours: 1, minutes: 5 })).toEqual('01:05:00:00')
@@ -19,7 +34,7 @@ test('using alias as description', () => {
media_content_id: "Good Morning", media_content_id: "Good Morning",
media_content_type: "SPOTIFY", media_content_type: "SPOTIFY",
} }
})).toEqual("Start Music In Kitchen") }, dummyNamer)).toEqual("Start Music In Kitchen")
}) })
@@ -33,7 +48,7 @@ test('get service action description', () => {
media_content_id: "Good Morning", media_content_id: "Good Morning",
media_content_type: "SPOTIFY", media_content_type: "SPOTIFY",
} }
})).toEqual("media_player.play_media") }, dummyNamer)).toEqual("media_player.play_media")
}) })
test('get repeat action description', () => { test('get repeat action description', () => {
@@ -42,27 +57,27 @@ test('get repeat action description', () => {
count: 10, count: 10,
sequence: [] sequence: []
} }
})).toEqual("Repeat 10") }, dummyNamer)).toEqual("Repeat 10")
}) })
test('get wait action description', () => { test('get wait action description', () => {
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
wait_template: "states(switch.kitchen_light) == 'on'" wait_template: "states(switch.kitchen_light) == 'on'"
})).toEqual("Wait on states(switch.kitchen_light) == 'on'") }, dummyNamer)).toEqual("Wait on states(switch.kitchen_light) == 'on'")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
wait_template: "states(switch.kitchen_light) == 'on'", wait_template: "states(switch.kitchen_light) == 'on'",
timeout: { timeout: {
'minutes': 1, 'minutes': 1,
} }
})).toEqual("Wait on states(switch.kitchen_light) == 'on' for 00:01:00:00") }, dummyNamer)).toEqual("Wait on states(switch.kitchen_light) == 'on' for 00:01:00:00")
}) })
test('get fire event action description', () => { test('get fire event action description', () => {
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
event: 'test_event', event: 'test_event',
event_data: {}, event_data: {},
})).toEqual("Trigger test_event") }, dummyNamer)).toEqual("Trigger test_event")
}) })
test('get device action description', () => { test('get device action description', () => {
@@ -70,63 +85,63 @@ test('get device action description', () => {
device_id: "12310das01231", device_id: "12310das01231",
domain: "zwave_js", domain: "zwave_js",
type: "set_value" type: "set_value"
})).toEqual("set_value on 12310das01231") }, dummyNamer)).toEqual("set_value on 12310das01231")
}) })
test('get choose action description', () => { test('get choose action description', () => {
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
choose: [], choose: [],
default: [], default: [],
})).toEqual("Choose") }, dummyNamer)).toEqual("Choose")
}) })
test('get and/or/not condition description', () => { test('get and/or/not condition description', () => {
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'and', condition: 'and',
conditions: [], conditions: [],
})).toEqual("Logic") }, dummyNamer)).toEqual("Logic")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'or', condition: 'or',
conditions: [], conditions: [],
})).toEqual("Logic") }, dummyNamer)).toEqual("Logic")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'not', condition: 'not',
conditions: [], conditions: [],
})).toEqual("Logic") }, dummyNamer)).toEqual("Logic")
}) })
test('get Numeric State condition description', () => { test('get Numeric State condition description', () => {
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'numeric_state', condition: 'numeric_state',
entity_id: 'sensor.temperature', entity_id: 'sensor.temperature',
})).toEqual("sensor.temperature?>?<") }, dummyNamer)).toEqual("sensor.temperature?>?<")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'numeric_state', condition: 'numeric_state',
entity_id: "" entity_id: ""
})).toEqual("Numeric State Condition") }, dummyNamer)).toEqual("Numeric State Condition")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: "numeric_state", condition: "numeric_state",
entity_id: 'sensor.temperature', entity_id: 'sensor.temperature',
above: '17', above: '17',
})).toEqual("sensor.temperature > 17") }, dummyNamer)).toEqual("sensor.temperature > 17")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'numeric_state', condition: 'numeric_state',
entity_id: 'sensor.temperature', entity_id: 'sensor.temperature',
below: '5', below: '5',
})).toEqual("sensor.temperature < 5") }, dummyNamer)).toEqual("sensor.temperature < 5")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'numeric_state', condition: 'numeric_state',
entity_id: 'sensor.temperature', entity_id: 'sensor.temperature',
above: '17', above: '17',
below: '20', below: '20',
})).toEqual("17 < sensor.temperature < 20") }, dummyNamer)).toEqual("17 < sensor.temperature < 20")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'numeric_state', condition: 'numeric_state',
entity_id: 'sensor.temperature', entity_id: 'sensor.temperature',
above: '17', above: '17',
below: '20', below: '20',
value_template: "{{ float(state.state) + 2 }}" value_template: "{{ float(state.state) + 2 }}"
})).toEqual("17 < sensor.temperature < 20") }, dummyNamer)).toEqual("17 < sensor.temperature < 20")
expect(getDescriptionFromAutomationNode({ expect(getDescriptionFromAutomationNode({
condition: 'numeric_state', condition: 'numeric_state',
entity_id: [ entity_id: [
@@ -136,7 +151,7 @@ test('get Numeric State condition description', () => {
above: '17', above: '17',
below: '20', below: '20',
value_template: "{{ float(state.state) + 2 }}" value_template: "{{ float(state.state) + 2 }}"
})).toEqual("17 < ... < 20") }, dummyNamer)).toEqual("17 < ... < 20")
}) })
test('get State condition description', () => { test('get State condition description', () => {
@@ -144,7 +159,7 @@ test('get State condition description', () => {
condition: 'state', condition: 'state',
entity_id: 'switch.kitchen_light', entity_id: 'switch.kitchen_light',
state: "on" state: "on"
})).toEqual("switch.kitchen_light is 'on'") }, dummyNamer)).toEqual("switch.kitchen_light is 'on'")
}) })
+24 -17
View File
@@ -2,6 +2,12 @@ import { AutomationNode, AutomationNodeTypes } from "types/automations";
import { AutomationTime } from "types/automations/common"; import { AutomationTime } from "types/automations/common";
export interface Namer {
getEntityName(entity_id: string | string[], maxEntities?: number): string;
getDeviceName(device_id: string): string;
getServiceName(service: string): string;
}
export const convertTimeToString = (t: AutomationTime) => { export const convertTimeToString = (t: AutomationTime) => {
if (typeof t === 'string') { if (typeof t === 'string') {
return t return t
@@ -15,7 +21,10 @@ export const convertTimeToString = (t: AutomationTime) => {
return [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':') return [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':')
} }
} }
export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => { export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
node: AutomationNode<N>,
namer: Namer,
): string => {
if (('alias' in node) && node.alias) { if (('alias' in node) && node.alias) {
return node.alias; return node.alias;
} }
@@ -40,9 +49,9 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
if (node.platform === 'state') { if (node.platform === 'state') {
let out = ""; let out = "";
if (typeof node.entity_id === 'string') { if (typeof node.entity_id === 'string') {
out = node.entity_id out = namer.getEntityName(node.entity_id)
} else { } else {
out = node.entity_id[0] + " and more" out = namer.getEntityName(node.entity_id[0]) + " and more"
} }
if (node.from) { if (node.from) {
out += ` from ${node.from}` out += ` from ${node.from}`
@@ -52,6 +61,9 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
} }
return out return out
} }
if (node.platform === 'device') {
return node.device_id ? namer.getDeviceName(node.device_id) : node.entity_id ? namer.getEntityName(node.entity_id) : node.platform
}
return node.platform return node.platform
} }
if ('condition' in node) { if ('condition' in node) {
@@ -65,7 +77,9 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
switch (node.condition) { switch (node.condition) {
case "numeric_state": case "numeric_state":
if (node.entity_id) { if (node.entity_id) {
const center = prettyEntityId(node.entity_id); const center = (Array.isArray(node.entity_id) && node.entity_id.length > 1) ?
'...' :
namer.getEntityName(node.entity_id);
if (node.above) { if (node.above) {
if (node.below) { if (node.below) {
return `${node.above} < ${center} < ${node.below}` return `${node.above} < ${center} < ${node.below}`
@@ -79,7 +93,7 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
} }
return "Numeric State Condition" return "Numeric State Condition"
case "state": case "state":
return `${node.entity_id} is '${node.state}'` return `${namer.getEntityName(node.entity_id)} is '${node.state}'`
case 'template': case 'template':
return node.value_template return node.value_template
default: default:
@@ -88,11 +102,14 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
} }
} }
if ('service' in node) { if ('service' in node) {
return node.service return namer.getServiceName(node.service)
} }
if ('repeat' in node) { if ('repeat' in node) {
return 'Repeat ' + node.repeat.count return 'Repeat ' + node.repeat.count
} }
if ('delay' in node) {
return `Wait for ${convertTimeToString(node.delay)}`
}
if ('wait_template' in node) { if ('wait_template' in node) {
let out = 'Wait on ' + node.wait_template; let out = 'Wait on ' + node.wait_template;
if (node.timeout) { if (node.timeout) {
@@ -104,7 +121,7 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
return `Trigger ${node.event}` return `Trigger ${node.event}`
} }
if ('device_id' in node) { if ('device_id' in node) {
return `${node.type ?? ""} on ${node.device_id ?? ""}` return `${node.type ?? ""} on ${node.device_id ? namer.getDeviceName(node.device_id) : ''}`
} }
if ('choose' in node) { if ('choose' in node) {
return "Choose" return "Choose"
@@ -112,16 +129,6 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
return 'n/a' return 'n/a'
} }
export const prettyEntityId = (entityId: string | string[]) => {
if (typeof entityId === 'string') {
return entityId
} else if (entityId.length === 1) {
return entityId[0]
} else {
return "..."
}
}
export const prettyName = (n: string) => { export const prettyName = (n: string) => {
const clean = n.replaceAll(/[.-_]/g, ' '); const clean = n.replaceAll(/[.-_]/g, ' ');
return clean.split(' ').map(x => x.slice(0, 1).toUpperCase() + x.slice(1)).join(' ') return clean.split(' ').map(x => x.slice(0, 1).toUpperCase() + x.slice(1)).join(' ')
+18 -1
View File
@@ -1,4 +1,4 @@
import { AutomationTimeObject, AutomationTimeString } from "types/automations/common"; import { AutomationTime, AutomationTimeObject, AutomationTimeString } from "types/automations/common";
const cleanTime = (t: number) => Math.max(0, Math.floor(t)) const cleanTime = (t: number) => Math.max(0, Math.floor(t))
@@ -28,4 +28,21 @@ export const convertObjectToAutomationTimeString = (t: AutomationTimeObject): Au
seconds = 0 seconds = 0
} = t } = t
return [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') return [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':')
}
export const convertAutomationTimeToTimeString = (t: AutomationTime | undefined): AutomationTimeString => {
let obj: AutomationTimeObject;
if (typeof t === 'string') {
obj = convertStringToAutomationTimeObject(t)
} else if (!t) {
return "00:00:00"
} else {
obj = t
}
return convertObjectToAutomationTimeString(obj);
}
export const convertAutomationTimeToTimeObject = (t: AutomationTime | undefined): AutomationTimeObject => {
return convertStringToAutomationTimeObject(convertAutomationTimeToTimeString(t))
} }
+56 -1
View File
@@ -2028,6 +2028,13 @@
prop-types "^15.8.1" prop-types "^15.8.1"
react-is "^17.0.2" react-is "^17.0.2"
"@mui/icons-material@^5.8.3":
version "5.8.3"
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.8.3.tgz#75c8bde42e6ba71e3871439a2b751be987343493"
integrity sha512-dAdhimSLKOV0Q8FR7AYGEaCrTUh9OV7zU4Ueo5REoUt4cC3Vy+UBKDjZk66x5ezaYb63AFgQIFwtnZj3B/QDbQ==
dependencies:
"@babel/runtime" "^7.17.2"
"@mui/material@^5.8.0": "@mui/material@^5.8.0":
version "5.8.2" version "5.8.2"
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.8.2.tgz#13547df6bb6991e064f42ee71ce17c30629e263a" resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.8.2.tgz#13547df6bb6991e064f42ee71ce17c30629e263a"
@@ -3594,6 +3601,11 @@
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@types/cookie@^0.3.3":
version "0.3.3"
resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
"@types/eslint-scope@^3.7.3": "@types/eslint-scope@^3.7.3":
version "3.7.3" version "3.7.3"
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
@@ -3669,6 +3681,14 @@
dependencies: dependencies:
"@types/unist" "*" "@types/unist" "*"
"@types/hoist-non-react-statics@^3.0.1":
version "3.3.1"
resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
dependencies:
"@types/react" "*"
hoist-non-react-statics "^3.3.0"
"@types/html-minifier-terser@^5.0.0": "@types/html-minifier-terser@^5.0.0":
version "5.1.2" version "5.1.2"
resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57"
@@ -6039,6 +6059,11 @@ cookie@0.5.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
cookie@^0.4.0:
version "0.4.2"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
copy-concurrently@^1.0.0: copy-concurrently@^1.0.0:
version "1.0.5" version "1.0.5"
resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -8503,7 +8528,7 @@ hmac-drbg@^1.0.1:
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1" minimalistic-crypto-utils "^1.0.1"
hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
version "3.3.2" version "3.3.2"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -8781,6 +8806,11 @@ ignore@^5.2.0:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
imask@^6.4.2:
version "6.4.2"
resolved "https://registry.yarnpkg.com/imask/-/imask-6.4.2.tgz#f1c67e6961640bf5b09d7b4a34dcf4f9a3df7e22"
integrity sha512-xvEgbTdk6y2dW2UAysq0NRPmO6PuaXM5NHIt4TXEJEwXUHj26M0p/fXqyrSJdNXFaGVOtqYjPRnNdrjQQhDuuA==
immer@^9.0.7: immer@^9.0.7:
version "9.0.14" version "9.0.14"
resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.14.tgz#e05b83b63999d26382bb71676c9d827831248a48" resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.14.tgz#e05b83b63999d26382bb71676c9d827831248a48"
@@ -12633,6 +12663,15 @@ react-colorful@^5.0.1:
resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784" resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784"
integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg== integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg==
react-cookie@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/react-cookie/-/react-cookie-4.1.1.tgz#832e134ad720e0de3e03deaceaab179c4061a19d"
integrity sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==
dependencies:
"@types/hoist-non-react-statics" "^3.0.1"
hoist-non-react-statics "^3.0.0"
universal-cookie "^4.0.0"
react-dev-utils@^12.0.1: react-dev-utils@^12.0.1:
version "12.0.1" version "12.0.1"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
@@ -12728,6 +12767,14 @@ react-flow-renderer@^10.1.2:
d3-zoom "^3.0.0" d3-zoom "^3.0.0"
zustand "^3.7.2" zustand "^3.7.2"
react-imask@^6.4.2:
version "6.4.2"
resolved "https://registry.yarnpkg.com/react-imask/-/react-imask-6.4.2.tgz#0bd1a4c6cc8838abfbbc340eab9f311831a57c37"
integrity sha512-xBGZyM0RwQ/ujX7f2ccaYxE41eB81q5Yqek6SYXAq6XT88+TdCSmIpgh5GeygRedPJu6tnnN8OXrUMTc2uFNSw==
dependencies:
imask "^6.4.2"
prop-types "^15.7.2"
react-inspector@^5.1.0: react-inspector@^5.1.0:
version "5.1.1" version "5.1.1"
resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.1.tgz#58476c78fde05d5055646ed8ec02030af42953c8" resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.1.tgz#58476c78fde05d5055646ed8ec02030af42953c8"
@@ -14900,6 +14947,14 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
unist-util-is "^4.0.0" unist-util-is "^4.0.0"
unist-util-visit-parents "^3.0.0" unist-util-visit-parents "^3.0.0"
universal-cookie@^4.0.0:
version "4.0.4"
resolved "https://registry.yarnpkg.com/universal-cookie/-/universal-cookie-4.0.4.tgz#06e8b3625bf9af049569ef97109b4bb226ad798d"
integrity sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==
dependencies:
"@types/cookie" "^0.3.3"
cookie "^0.4.0"
universalify@^0.1.2: universalify@^0.1.2:
version "0.1.2" version "0.1.2"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"