Compare commits

...
16 Commits
Author SHA1 Message Date
ari a530e5e6e0 clean ups 2022-05-31 17:13:15 -04:00
ari 1ad87c205d updated emitters 2022-05-31 13:28:11 -04:00
ari d45f72b168 badges 2022-05-31 13:21:31 -04:00
ari 0c7db09c32 removed desc 2022-05-31 12:50:53 -04:00
ari 2b1648eff2 added desc to build 2022-05-31 12:50:15 -04:00
ari 06356b46e9 deployment 2022-05-31 12:46:11 -04:00
ari 21fe64f4bf added supervisor token + snackbar for errors 2022-05-31 12:19:58 -04:00
ari e22f64dd51 updated all packages to latest 2022-05-31 11:24:37 -04:00
ari f1b24ec783 device id 2022-05-30 19:48:55 -04:00
ari 8a90b56ac3 fixed tsc 2022-05-30 15:20:42 -04:00
ari 7d111c853b slight improvement on condition editor for mobile 2022-05-30 15:14:47 -04:00
ari 0c72481729 clean up 2022-05-30 15:10:33 -04:00
ari 996626f9af input entities 2022-05-30 15:05:54 -04:00
ari 878035e748 added ha websockets 2022-05-29 22:06:21 -04:00
ari cc930ee4ac dealt with linitng errors 2022-05-29 21:06:43 -04:00
ari 169a2e9059 loaders 2022-05-27 16:43:31 -04:00
77 changed files with 4808 additions and 3919 deletions

No files matched your search

+2
View File
@@ -2,3 +2,5 @@ webapp/node_modules
webapp/build
webapp/.storybook
webapp/.vscode
webapp/.env.local
webapp/tmux.sh
-1
View File
@@ -30,5 +30,4 @@ jobs:
args: |
--${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target .
-1
View File
@@ -101,5 +101,4 @@ jobs:
args: |
--${{ matrix.arch }} \
--version ${{ needs.metadata.outputs.version }} \
--additional-tag edge \
--target .
+1 -1
View File
@@ -1,4 +1,4 @@
# Changelog
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.1.14] - Material UI + Autocomplete v2
+3 -3
View File
@@ -10,6 +10,7 @@ ARG BUILD_VERSION
# <--- Environment Variables -->
ENV HASSIO_TOKEN ""
ENV SUPERVISOR_TOKEN ""
ENV BUILD_VERSION $BUILD_VERSION
# <--- System Wide Dependencies -->
@@ -39,8 +40,6 @@ RUN /app/bin/build.sh /app /app/web-builder
# <--- Api Code -->
COPY api/src /app/src
COPY run.sh /app/run.sh
RUN chmod +x /app/run.sh
# <--- Ports -->
EXPOSE 8000
@@ -50,5 +49,6 @@ LABEL \
io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64"
CMD [ "/app/run.sh" ]
ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
+27 -2
View File
@@ -1,9 +1,29 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
build-with-builder:
docker run \
--rm \
--privileged \
-v ~/.docker:/root/.docker \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
-v ${PWD}:/data \
homeassistant/amd64-builder \
--amd64 \
--test \
--version ${BUILD_TAG} \
-t /data
build:
$(DC) build
run:
build-no-cache:
$(DC) build --no-cache
push:
$(DC) push
start:
$(MAKE) build
$(DC) up -d
sleep 1
@@ -18,3 +38,8 @@ ps:
stop:
$(DC) stop
bash:
$(DC) exec addon bash
config:
$(DC) config
+5 -1
View File
@@ -1,6 +1,10 @@
# Shortumation
# Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/asosnovsky/Shortumation/Manual%20Build)
| | Stable | amd64-edge | i386-edge | armv7-edge | aarch64-edge | armhf-edge |
| --- | --- | --- | --- | --- | --- | --- |
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-i386?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-armv7?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-aarch64?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-armhf?&sort=date&label=&style=for-the-badge) |
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
+4 -5
View File
@@ -16,12 +16,11 @@ init: false
ingress: true
ingress_port: 8000
ingress_entry: "web/"
panel_icon: mdi:home-automation
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: false
homeassistant_api: true
auth_api: true
panel_icon: mdi:home-automation
hassio_role: homeassistant
host_network: false
map:
- config:rw
options: {}
+2 -2
View File
@@ -1,10 +1,10 @@
version: '3'
services:
addon:
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
build:
context: "./"
dockerfile: "./Dockerfile"
args:
BUILD_ARCH: ${ARCH:-amd64}
BUILD_VERSION: ${BUILD_TAG:-latest}
BUILD_VERSION: ${BUILD_TAG:-edge}
+12
View File
@@ -0,0 +1,12 @@
#!/bin/bash
api_location=${1}
pushd $api_location
echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION
echo "HASSIO_TOKEN = "$HASSIO_TOKEN
echo "SUPERVISOR_TOKEN = "$SUPERVISOR_TOKEN
echo $(python --version)
echo "--------------------"
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
-4
View File
@@ -1,4 +0,0 @@
#!/bin/bash
echo $(python --version)
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
+1 -1
View File
@@ -1,5 +1,5 @@
0:
Type: Generic
Type: Generic2
1:
Type: Generic
2:
+1 -1
View File
@@ -1 +1 @@
SKIP_PREFLIGHT_CHECK=true
SKIP_PREFLIGHT_CHECK=true
+3
View File
@@ -1,4 +1,7 @@
module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
+22 -14
View File
@@ -8,22 +8,25 @@
"@emotion/styled": "^11.8.1",
"@mui/material": "^5.8.0",
"@mui/styles": "^5.8.0",
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.36",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.5",
"@uiw/react-codemirror": "^4.7.0",
"autosuggest-highlight": "^3.2.1",
"home-assistant-js-websocket": "^7.1.0",
"jss": "^10.8.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"notistack": "^2.0.5",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"react-scripts": "4.0.3",
"react-scripts": "5.0.1",
"superstruct": "^0.15.4",
"theming": "^3.3.0",
"typescript": "^4.1.2",
"web-vitals": "^1.0.1",
"web-vitals": "^2.1.4",
"yarn": "^1.22.17"
},
"scripts": {
@@ -71,19 +74,24 @@
"@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/builder-webpack5": "^6.5.6",
"@storybook/manager-webpack5": "^6.5.6",
"@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/preset-create-react-app": "^4.1.1",
"@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.0",
"@types/autosuggest-highlight": "^3.2.0",
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^27.5.1",
"ts-node": "^10.4.0"
"jest-environment-jsdom": "^28.1.0",
"ts-node": "^10.8.0",
"webpack": "^5.72.1",
"webpack-dev-server": "^4.9.0"
},
"moduleDirectories": [
"node_modules",
"src"
]
}
}
+1
View File
@@ -6,6 +6,7 @@ import { ErrorBoundary } from 'components/ErrorBoundary';
function App() {
const api = useConnectedApiService();
return (
<div className="app">
<ErrorBoundary>
@@ -2,7 +2,7 @@ import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations";
import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText";
import { FC, useRef, useState } from 'react';
import { FC, ReactNode, useRef, useState } from 'react';
import { AddIcon, TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
import InputAutoText from "components/Inputs/InputAutoText";
@@ -14,6 +14,7 @@ interface Props {
tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB;
children?: ReactNode;
}
export const AutoInfoBox: FC<Props> = ({
metadata,
@@ -1,5 +1,6 @@
.automation-editor {
display: flex;
position: relative;
flex-direction: row;
width: 100%;
height: 100%;
@@ -74,4 +75,26 @@
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg);
z-index: 2;
}
.automation-editor.loading .mock-list {
position: absolute;
left: 0;
width: 40%;
height: 100%;
}
.automation-editor.loading .mock-graph {
position: absolute;
left: 40%;
width: 60%;
height: 100%;
}
.automation-editor .linear-loader {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
@@ -21,7 +21,7 @@ const Template: ComponentStory<typeof AutomationEditor> = args => {
return <Page>
<AutomationEditor
{...args}
tagDB={makeTagDB([state as any])}
tagDB={makeTagDB(state ? [state] : [])}
automation={state}
onUpdate={s => {
window.setTimeout(() => setState(s), 3000)
@@ -11,6 +11,8 @@ import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import { MiniFailure } from 'types/validators/helper';
import InputYaml from "components/Inputs/InputYaml";
import { TagDB } from "components/AutomationList/TagDB";
import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress";
interface Props {
automation?: AutomationData;
@@ -41,7 +43,9 @@ export const AutomationEditor: FC<Props> = ({
// render
if (state.status === 'loading') {
return <div className="automation-editor loading">
Loading...
<LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div>
}
if (state.status === 'invalid') {
@@ -53,6 +57,7 @@ export const AutomationEditor: FC<Props> = ({
/>
}
return <div className="automation-editor">
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
@@ -64,7 +69,8 @@ export const AutomationEditor: FC<Props> = ({
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon>
Icon={ArrowIcon}
/>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
@@ -6,7 +6,7 @@ import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = {
status: 'unchanged' | 'changed',
status: 'unchanged' | 'changed' | 'saving',
data: EditorData
} | {
status: 'loading'
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
}), {})
};
update({
status: "loading",
status: "saving",
data,
})
onSave(cleanData);
}
@@ -140,3 +140,41 @@ BadAutmations.args = {
}
],
}
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <Page>
<AutomationList {...args} automations={autos}
onAdd={a => {
window.setTimeout(() => {
args.onAdd(a);
setAutos([...autos, a]);
}, 10000)
}}
onRemove={i => {
window.setTimeout(() => {
args.onRemove(i);
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}, 10000)
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}, 10000)
}}
/>
</Page>
}
FewAutosWithSlowLoader.args = {
...FewAutosWithSlowLoader.args,
automations: bigMockAutoList,
}
@@ -1,6 +1,6 @@
import "./AutomationListBox.css";
import { FC, useState } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations";
import { AutomationData } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button";
@@ -45,3 +45,20 @@ FewAutos.args = {
createMockAuto(),
],
}
export const Loading: ComponentStory<any> = args => {
const api = useMockApiService(args.initialAutomations);
return <Page>
<ConnectedAutomationList
{...args}
api={{
...api,
state: {
"automations": {
"ready": false
}
}
}}
/>
</Page>
}
@@ -18,6 +18,25 @@
flex: 1;
}
/* Loading state */
.automation-list--root.loading {
width: 100%;
height: 100%;
flex-direction: column;
}
.automation-list--root.loading>* {
width: 100%;
}
.automation-list--root.loading .automation-list--circle-loader {
width: 100%;
height: 100%;
justify-content: center;
align-items: center;
display: flex;
}
/* list children: on hide */
.automation-list--list.hide>.automation-list-box {
width: 0;
+12 -5
View File
@@ -1,7 +1,7 @@
import "./index.css";
import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor";
import { FC, useState } from "react";
import { FC, ReactNode, useState } from "react";
import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults';
import { ArrowIcon } from "components/Icons";
@@ -11,6 +11,8 @@ import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress";
interface AutomationListParams {
@@ -19,6 +21,7 @@ interface AutomationListParams {
onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void;
dims: DAGAutomationFlowDims;
children?: ReactNode;
}
export const AutomationList: FC<AutomationListParams> = ({
@@ -57,9 +60,8 @@ export const AutomationList: FC<AutomationListParams> = ({
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
>
{ArrowIcon}
</ButtonIcon>
Icon={ArrowIcon}
/>
</div>
<div className="automation-list--viewer">
{currentAuto ? <AutomationEditor
@@ -88,7 +90,12 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
dims
}) => {
if (!automations.ready) {
return <span>Loading...</span>
return <div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div>
}
if (!automations.ok) {
return <span>Error {automations.error}</span>
@@ -8,6 +8,7 @@ import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender";
import { useStyles } from "./style";
import { getViewer } from "./viewRender";
import useWindowSize from "utils/useWindowSize";
@@ -31,6 +32,7 @@ export const ConditionNode: FC<{
// state
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false);
const { isMobile } = useWindowSize();
// alias
const effectiveDM = internalDisplayMode || yamlMode;
// effect
@@ -76,54 +78,56 @@ export const ConditionNode: FC<{
} else if (condition.condition === 'or') {
hasChildren = true
}
const { classes } = useStyles({ hasChildren });
const { classes } = useStyles({ hasChildren, isMobile });
// components
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
return <div className={classes.root}>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={[
'or', 'not', 'and',
'template',
'numeric_state',
'state',
'time',
'trigger',
'zone',
]}
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
{yamlMode ? 'visual' : 'yaml'}
</button>}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</button>}
</div>
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition}
onChange={update => onUpdate(update as any)}
/>}
<div className={classes.conditionWrap}>
{!yamlMode && childrenConditions}
<>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={[
'or', 'not', 'and',
'template',
'numeric_state',
'state',
'time',
'trigger',
'zone',
]}
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
{yamlMode ? 'visual' : 'yaml'}
</button>}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</button>}
</div>
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition}
onChange={update => onUpdate(update as any)}
/>}
<div className={classes.conditionWrap}>
{!yamlMode && childrenConditions}
</div>
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
</>
</div>
}
@@ -2,7 +2,7 @@ import { FC } from "react";
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText";
import { InputEntity } from "components/Inputs/InputTextBubble";
import { InputEntity } from "components/Inputs/InputEntities";
import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater";
import InputTime from "components/Inputs/InputTime";
@@ -60,6 +60,7 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
return <>
<InputEntity
value={condition.entity_id}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
@@ -120,6 +121,7 @@ export const StateEditor: Editor<StateCondition> = ({
return <>
<InputEntity
value={condition.entity_id}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
@@ -196,6 +198,7 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
})} />
<InputEntity
value={condition.entity_id}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
@@ -2,7 +2,8 @@ import { Styles } from "jss";
import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{
hasChildren: boolean
hasChildren: boolean,
isMobile: boolean,
}>(theme => {
const deleteBtn: Styles = {
borderRadius: '10px',
@@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{
}
}
return {
root: ({ hasChildren }) => ({
root: ({ hasChildren, isMobile }) => ({
background: theme.primary,
padding: 0,
position: 'relative',
display: 'flex',
flexDirection: hasChildren ? 'column' : 'row',
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
}),
title: ({ hasChildren }) => ({
display: 'flex',
@@ -1,5 +1,5 @@
import "./index.css";
import { Component, ErrorInfo } from "react";
import { Component, ErrorInfo, ReactNode } from "react";
type State = {
hasError: false;
@@ -8,7 +8,9 @@ type State = {
error: any,
errorInfo?: ErrorInfo,
}
export class ErrorBoundary extends Component<{}, State> {
export class ErrorBoundary extends Component<{
children: ReactNode
}, State> {
state: State = {
hasError: false
+3 -3
View File
@@ -5,7 +5,7 @@ import { createAppUseStyles } from 'styles/theme';
export interface ButtonIconStyleProps {
}
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
children: FC<IconBaseProps>;
Icon: FC<IconBaseProps>;
}
const useButtonIconStyles = createAppUseStyles(theme => ({
buttonIcon: {
@@ -22,9 +22,9 @@ const useButtonIconStyles = createAppUseStyles(theme => ({
export const ButtonIcon: FC<ButtonIconProps> = ({
children: Child,
Icon,
className,
...props
}) => <Child
}) => <Icon
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
/>
@@ -32,7 +32,7 @@ IconList.args = {
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
return <Page>
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon>
<ButtonIcon {...args} Icon={ArrowIcon} />
</Page>
}
ButtonIconExample.args = {
@@ -0,0 +1,36 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { InputDevice } from "./InputDevice";
export default {
title: 'Inputs/InputDevice',
component: InputDevice,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof InputDevice>;
const Template: ComponentStory<typeof InputDevice> = args => {
const [value, setValue] = useState(args.value)
return <Page>
<div style={{
maxWidth: 200
}}>
<InputDevice {...args} value={value as any} onChange={(v: any) => {
setValue(v)
args.onChange(v as any)
}} />
</div>
</Page>
}
export const Single = Template.bind({})
Single.args = {
...Single.args,
multiple: false,
value: 'sensor.bathroom'
} as any
@@ -0,0 +1,117 @@
import "./InputEntities.css";
import { FC } from "react";
import { useHADeviceRegistry } from 'haService';
import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { EntityId } from 'types/automations/common';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
import { prettyName } from 'utils/formatting';
export type InputEntityProps = {
label?: string,
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: EntityId;
multiple: true;
onChange: (v: string[]) => void;
})
export const InputDevice: FC<InputEntityProps> = props => {
// state
const dr = useHADeviceRegistry();
// processing of inputs
const options = dr.getOptions();
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : [];
// events
const onChange = (_e: any, v: any) => {
const cleanValue: string[] = v === null ? [] :
Array.isArray(v) ? v.map(opt => {
if (typeof opt === 'string') {
return opt
}
return opt.id
}) : [v];
if (props.multiple) {
props.onChange(cleanValue);
} else {
props.onChange(cleanValue[cleanValue.length - 1])
}
}
return <Autocomplete
className="input-entities"
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={dr.getLabel}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.manufacturer) : ''}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase();
return opts.map(opt => {
let similarityScore = 0;
const eid = dr.getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
const name = dr.getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
return {
label: name,
id: eid,
similarityScore,
manufacturer: (typeof opt === 'string') ? '' : opt.manufacturer ?? ""
}
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
return (a.similarityScore > b.similarityScore) ? 1 : -1
})
}}
renderOption={(prop, option, { inputValue }) => {
const label = dr.getLabel(option);
const id = dr.getID(option);
return <SearchItem
listProps={prop}
id={id}
label={label}
searchTerm={inputValue}
/>
}}
renderInput={params => <TextField
{...params}
variant="filled"
label={props.label ?? "Device"}
/>}
renderTags={(tagValue, getTagProps) => <Badge badgeContent={tagValue.length} color="info">
<div className="input-entities--tags">
{tagValue.map((option, index) => {
const label = dr.getLabel(option);
const id = dr.getID(option);
const props = getTagProps({ index });
props.className += ' input-entities--chip'
return (
<Chip
size="medium"
label={<>
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
{(id !== label) && <small>{id}</small>}
</>}
{...props}
/>
)
})}
</div>
</Badge>
}
/>
}
@@ -0,0 +1,35 @@
.input-entities .BaseBadge-root {
max-width: 100%;
}
.input-entities--chip>span {
display: flex;
flex-direction: row;
gap: 0.15em;
}
.input-entities--chip>span>small::before {
content: "/ ";
}
.input-entities--chip>span>small {
size: 0.15em;
}
.input-entities--errors {
margin-top: 0.75em;
}
.input-entities--errors ul {
padding: 0 0 0 1em;
margin: 0;
max-height: 2.5em;
overflow-y: auto;
overflow-x: hidden;
}
.input-entities--tags {
max-height: 5em;
max-width: 100%;
overflow: auto;
}
@@ -0,0 +1,138 @@
import "./InputEntities.css";
import { FC } from "react";
import { useHAEntities } from 'haService';
import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { prettyName } from "utils/formatting";
import { EntityId } from 'types/automations/common';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
export type InputEntityProps = {
restrictToDomain?: string[],
label?: string,
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: EntityId;
multiple: true;
onChange: (v: string[]) => void;
})
export const InputEntity: FC<InputEntityProps> = props => {
// state
const entities = useHAEntities();
// processing of inputs
const options = entities.getOptions(props.restrictToDomain);
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : [];
const errors = entities.validateOptions(value, props.restrictToDomain);
// processing of errors
let helperText = <></>;
let error: boolean = false;
if (errors !== null) {
error = true
if (errors.length > 0) {
helperText = <Badge
className="input-entities--errors"
badgeContent={errors.length} color="error"
>
<ul title={errors.join(', and')}>{errors.map((msg, i) => <li key={i}>
{msg}
</li>)}</ul>
</Badge>
}
}
// events
const onChange = (_e: any, v: any) => {
const cleanValue: string[] = v === null ? [] :
Array.isArray(v) ? v.map(opt => {
if (typeof opt === 'string') {
return opt
}
return opt.id
}) : [v];
if (props.multiple) {
props.onChange(cleanValue);
} else {
props.onChange(cleanValue[cleanValue.length - 1])
}
}
return <Autocomplete
className="input-entities"
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={entities.getLabel}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase();
return opts.map(opt => {
let similarityScore = 0;
const eid = entities.getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
const name = entities.getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
return {
label: name,
id: eid,
domain: (typeof opt === 'string') ? '' : opt.domain,
similarityScore
}
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
return (a.similarityScore > b.similarityScore) ? 1 : -1
})
}}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
renderOption={(prop, option, { inputValue }) => {
const label = entities.getLabel(option);
const id = entities.getID(option);
return <SearchItem
listProps={prop}
id={id}
label={label}
searchTerm={inputValue}
/>
}}
renderInput={params => <TextField
{...params}
variant="filled"
label={props.label ?? "Entity ID"}
helperText={helperText}
error={error}
/>}
renderTags={(tagValue, getTagProps) => <Badge badgeContent={tagValue.length} color="info">
<div className="input-entities--tags">
{tagValue.map((option, index) => {
const label = entities.getLabel(option);
const id = entities.getID(option);
const props = getTagProps({ index });
props.className += ' input-entities--chip'
return (
<Chip
size="medium"
label={<>
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
{(id !== label) && <small>{id}</small>}
</>}
{...props}
/>
)
})}
</div>
</Badge>
}
/>
}
@@ -0,0 +1,84 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { InputEntity } from "./InputEntities";
export default {
title: 'Inputs/InputEntity',
component: InputEntity,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof InputEntity>;
const Template: ComponentStory<typeof InputEntity> = args => {
const [value, setValue] = useState(args.value)
return <Page>
<div style={{
maxWidth: 200
}}>
<InputEntity {...args} value={value as any} onChange={(v: any) => {
setValue(v)
args.onChange(v as any)
}} />
</div>
</Page>
}
export const Single = Template.bind({})
Single.args = {
...Single.args,
multiple: false,
value: 'sensor.bathroom'
} as any
export const Many = Template.bind({})
Many.args = {
...Many.args,
multiple: true,
value: ['sensor.bathroom', 'person.ari']
} as any
export const ManyEmpty = Template.bind({})
ManyEmpty.args = {
...ManyEmpty.args,
multiple: true,
value: []
} as any
export const ManyButGotSingle = Template.bind({})
ManyButGotSingle.args = {
...ManyButGotSingle.args,
multiple: true,
value: 'sensor.bathroom'
} as any
export const InvalidDomain = Template.bind({})
InvalidDomain.args = {
...InvalidDomain.args,
multiple: true,
value: 'sensor.bathroom',
restrictToDomain: ['zone'],
} as any
export const InvalidManyDomain = Template.bind({})
InvalidManyDomain.args = {
...InvalidManyDomain.args,
multiple: true,
value: 'sensor.bathroom',
restrictToDomain: ['zone', 'switch'],
} as any
export const InvalidLots = Template.bind({})
InvalidLots.args = {
...InvalidLots.args,
multiple: true,
value: ['person.ari', 'sensor.bathroom', 'binary_sensor.ping_tv', 'device_tracker.phone'],
restrictToDomain: ['zone', 'switch'],
} as any
@@ -49,26 +49,4 @@ export const InputList: FC<Props<any>> = ({
</Select>
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
</FormControl>
// return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
// <select
// title={invalidCurrent ? "Invalid Selection" : ""}
// className={classes.input}
// {...selattr} value={current}
// onChange={e => {
// e.preventDefault();
// if (e.currentTarget.id === 'invalid') {
// onChange(options[0])
// } else {
// onChange(e.currentTarget.value as any);
// }
// }}
// >
// {options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
// {invalidCurrent ? <option
// id={'invalid'}
// value={current}
// style={{ display: 'none' }}
// >!{current}!</option> : <></>}
// </select>
// </InputWrapper>
}
@@ -2,7 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import InputTextBubble, { InputEntity } from "./InputTextBubble";
import InputTextBubble from "./InputTextBubble";
export default {
title: 'Inputs/InputTextBubble',
@@ -34,16 +34,6 @@ export const JustText: ComponentStory<typeof InputTextBubble> = args => {
</Page>
}
export const EntityId: ComponentStory<typeof InputTextBubble> = args => {
const [value, setValue] = useState<string | string[]>(['sensor.bathroom'])
return <Page>
<InputEntity value={value} onChange={setValue} />
</Page>
}
export const ManyOptions: ComponentStory<typeof InputTextBubble> = args => {
const [value, setValue] = useState<string | string[]>('hello')
@@ -1,32 +1,39 @@
import Chip from "@mui/material/Chip";
import TextField from "@mui/material/TextField";
import Autocomplete from "@mui/material/Autocomplete";
import { FC } from "react";
export interface Props {
label: string;
value: string | string[];
value?: string | string[];
options?: string[];
onChange: (v: string[]) => void;
maxAllowed?: number;
}
export default function InputTextBubble({
value = "",
label,
options = [],
onChange,
maxAllowed,
}: Props) {
const selected = Array.isArray(value) ? value : [value];
const selected = Array.isArray(value) ? value : value ? [value] : [];
return <Autocomplete
multiple
freeSolo
value={selected}
options={options}
onChange={(_e, v) => onChange(
v === null ? [] :
onChange={(_e, v) => {
let cleanValue = v === null ? [] :
Array.isArray(v) ? v : [v]
)}
if (maxAllowed) {
cleanValue = cleanValue.slice(0, maxAllowed);
}
onChange(cleanValue)
}}
renderInput={params => <TextField
{...params}
variant="filled"
@@ -42,15 +49,3 @@ export default function InputTextBubble({
}
/>
}
export const InputEntity: FC<{
value: string | string[];
onChange: (v: string[]) => void;
}> = ({
value,
onChange,
}) => <InputTextBubble
value={value}
onChange={onChange}
label="Entity ID"
/>
@@ -1,4 +1,4 @@
import { FC } from "react";
import { FC, ReactNode } from "react";
import { useInputWrapperStyles } from "./styles";
@@ -8,6 +8,7 @@ export interface Props {
noMargin?: boolean;
className?: string;
error?: string;
children: ReactNode;
}
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
const { classes } = useInputWrapperStyles({ labelSize, noMargin, hasError: !!error })
@@ -0,0 +1,28 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { SearchItem } from "./extras";
export default {
title: 'Inputs/Extras/SearchItem',
component: SearchItem,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof SearchItem>;
const Template: ComponentStory<typeof SearchItem> = args => {
return <Page>
<SearchItem {...args} />
</Page>
}
export const Simple = Template.bind({})
Simple.args = {
id: "sensor.humidity_main_bedroom",
label: 'Main Bedroom Humidity',
searchTerm: "bedroom",
listProps: {},
} as any
+9
View File
@@ -0,0 +1,9 @@
.input-extras--search-item--list {
display: flex;
flex-direction: row;
gap: 0.15em;
}
.input-extras--search-item--list>small::before {
content: "/ ";
}
+47
View File
@@ -0,0 +1,47 @@
import "./extras.css";
import { FC } from "react";
import parse from 'autosuggest-highlight/parse';
import match from 'autosuggest-highlight/match';
export const HighlightElm: FC<{
text: string,
searchTerm: string
}> = ({
text,
searchTerm
}) => {
const matches = match(text, searchTerm, {
"findAllOccurrences": true,
"insideWords": true
});
const parts = parse(text, matches);
return <>
{parts.map((part, index) => (
<span
key={index}
style={{
textDecoration: part.highlight ? 'underline' : 'unset'
}}
>
{part.text}
</span>
))}
</>
}
export const SearchItem: FC<{
listProps: React.HTMLAttributes<HTMLLIElement>,
label: string,
id: string,
searchTerm: string,
}> = ({
listProps,
label,
id,
searchTerm
}) => <li {...listProps} className={[listProps.className ?? "", 'input-extras--search-item--list'].join(' ')}>
<b><HighlightElm text={label} searchTerm={searchTerm} /></b> <small>
<HighlightElm text={id} searchTerm={searchTerm} />
</small>
</li>
+2 -1
View File
@@ -1,10 +1,11 @@
import { FC } from "react";
import { FC, ReactNode } from "react";
import { createAppUseStyles } from "styles/theme";
export interface ModalStyleProps {
open: boolean;
}
export interface Props extends ModalStyleProps {
children: ReactNode;
}
const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
root: ({ open }) => ({
@@ -1,3 +1,5 @@
import { InputDevice } from "components/Inputs/InputDevice";
import { InputEntity } from "components/Inputs/InputEntities";
import InputText from "components/Inputs/InputText";
import { DeviceAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager';
@@ -6,44 +8,28 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionDeviceState: OptionManager<DeviceAction> = {
defaultState: () => ({
alias: "",
type: "",
entity_id: "",
device_id: "",
domain: "",
device_id: ""
}),
isReady: ({
alias,
type,
entity_id,
device_id,
domain,
}) => (
alias !== '' &&
type !== "" &&
entity_id !== "" &&
device_id !== "" &&
domain !== ""
),
renderOptionList: (state, setState) => {
isReady: () => true,
renderOptionList: (state, setState, entities) => {
const update = updateActionData(state, setState);
return <>
<InputText
textBoxFor="device_id"
label="Device"
value={state.device_id}
onChange={device_id => update({ device_id })}
<InputDevice
value={state.device_id ?? ""}
onChange={device_id => update({ device_id: device_id ?? "" })}
/>
<InputText
textBoxFor="type"
label="Action"
value={state.type}
value={state.type ?? ""}
onChange={type => update({ type })}
/>
<InputText
textBoxFor="entity_id"
label="Entity ID"
<InputEntity
value={state.entity_id ?? ""}
onChange={entity_id => update({ entity_id, domain: entity_id.split('.')[0] })}
onChange={entity_id => update({
entity_id: entity_id ? entity_id : undefined,
domain: entity_id ? entity_id.split('.')[0] : ""
})}
/>
</>
}
@@ -1,9 +1,10 @@
import { HAEntitiesState } from 'haService';
import { AutomationAction } from 'types/automations/actions';
import { AutomationCondition } from 'types/automations/conditions';
export interface OptionManager<T> {
defaultState(): T;
isReady(s: T): boolean;
renderOptionList(s: T, set: (s: T) => void): JSX.Element;
renderOptionList(s: T, set: (s: T) => void, entities: HAEntitiesState): JSX.Element;
}
@@ -1,26 +1,21 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerDevice } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputTextBubble';
import { InputEntity } from 'components/Inputs/InputEntities';
import InputTextBubble from 'components/Inputs/InputTextBubble';
import { InputDevice } from 'components/Inputs/InputDevice';
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
defaultState: () => ({
"platform": 'device',
"domain": "",
"type": "",
"subtype": "",
"device_id": "",
"entity_id": "",
}),
isReady: ({ }) => {
return true
},
renderOptionList: (state, setState) => {
isReady: () => true,
renderOptionList: (state, setState, { getDomainList }) => {
return <>
<InputText label="Domain" value={state.domain ?? ""} onChange={domain => setState({
<InputTextBubble label="Domain" options={getDomainList()} value={state.domain} onChange={domain => setState({
...state,
domain
domain: domain ? domain[0] : "",
})} />
<InputText label="Type" value={state.type ?? ""} onChange={type => setState({
...state,
@@ -30,11 +25,11 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
...state,
subtype
})} />
<InputText label="Device" value={state.device_id ?? ""} onChange={device_id => setState({
<InputDevice value={state.device_id ?? ""} onChange={device_id => setState({
...state,
device_id
device_id: device_id ?? "",
})} />
<InputEntity value={state.entity_id ?? ""} onChange={entity_id => setState({
<InputEntity restrictToDomain={state.domain ? [state.domain] : undefined} value={state.entity_id ?? ""} multiple onChange={entity_id => setState({
...state,
entity_id
})} />
@@ -8,9 +8,7 @@ export const TriggerHAState: OptionManager<AutomationTriggerHA> = {
"platform": "homeassistant",
"event": "start",
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputList
@@ -10,9 +10,7 @@ export const TriggerMQTTState: OptionManager<AutomationTriggerMQTT> = {
"topic": "",
"value_template": ""
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputText
@@ -1,7 +1,7 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerNumericState } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputTextBubble';
import { InputEntity } from 'components/Inputs/InputEntities';
import InputNumber from 'components/Inputs/InputNumber';
import InputTime from 'components/Inputs/InputTime';
import InputYaml from 'components/Inputs/InputYaml';
@@ -12,13 +12,12 @@ export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> =
"platform": 'numeric_state',
"entity_id": "",
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputEntity
value={state.entity_id}
multiple
onChange={entity_id => setState({
...state,
entity_id
@@ -1,7 +1,7 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerState } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputTextBubble';
import { InputEntity } from 'components/Inputs/InputEntities';
import InputTime from 'components/Inputs/InputTime';
@@ -10,13 +10,12 @@ export const TriggerState: OptionManager<AutomationTriggerState> = {
"platform": 'state',
"entity_id": "",
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputEntity
value={state.entity_id}
multiple
onChange={entity_id => setState({
...state,
entity_id
@@ -9,9 +9,7 @@ export const TriggerTemplate: OptionManager<AutomationTriggerTemplate> = {
"platform": 'template',
"value_template": "",
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputText
@@ -9,9 +9,7 @@ export const TriggerTime: OptionManager<AutomationTriggerTime> = {
"platform": 'time',
"at": "",
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputTime
@@ -7,9 +7,7 @@ export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
defaultState: () => ({
"platform": 'time_pattern',
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputText label="Hours" value={state.hours ?? ""} onChange={hours => setState({
@@ -8,9 +8,7 @@ export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
"platform": 'webhook',
"webhook_id": "",
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputText label="Webhook ID" value={state.webhook_id ?? ""} onChange={webhook_id => setState({
@@ -1,8 +1,7 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerZone } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputList } from 'components/Inputs/InputList';
import { InputEntity } from 'components/Inputs/InputTextBubble';
import { InputEntity } from 'components/Inputs/InputEntities';
export const TriggerZone: OptionManager<AutomationTriggerZone> = {
@@ -12,14 +11,12 @@ export const TriggerZone: OptionManager<AutomationTriggerZone> = {
"event": "enter",
"entity_id": "",
}),
isReady: ({ }) => {
return true
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputText label="Zone" value={state.zone ?? ""} onChange={zone => setState({
<InputEntity label="Zone" restrictToDomain={['zone']} value={state.zone} onChange={zone => setState({
...state,
zone
zone: zone ?? ""
})} />
<InputList
label="Event"
@@ -30,6 +27,8 @@ export const TriggerZone: OptionManager<AutomationTriggerZone> = {
})}
/>
<InputEntity
multiple
restrictToDomain={["device_tracker", "person"]}
value={state.entity_id}
onChange={entity_id => setState({
...state,
@@ -6,6 +6,7 @@ import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils
import InputYaml from 'components/Inputs/InputYaml';
import InputText from 'components/Inputs/InputText';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
import { useHAEntities } from 'haService';
type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>]
@@ -15,6 +16,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
isModified: false,
...computeInvalidYaml(originalNode)
});
const entities = useHAEntities();
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
useEffect(() => {
setAllState({ ...allState, node: originalNode, isModified: false, })
@@ -93,7 +95,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
}
return <>
{aliasEditor}
{optionManager.renderOptionList(currentNode, setState)}
{optionManager.renderOptionList(currentNode, setState, entities)}
</>;
},
isReady() {
@@ -65,6 +65,14 @@ UnSupported.args = {
} as any,
}
export const DeviceTriggerExample = Action.bind({})
DeviceTriggerExample.args = {
...DeviceTriggerExample.args,
node: {
"platform": 'device',
},
}
export const InAModal: ComponentStory<typeof NodeEditor> = props => {
+2 -1
View File
@@ -1,6 +1,6 @@
import "./index.css";
import { FC } from 'react';
import { FC, ReactNode } from 'react';
import { AutomationNode, AutomationNodeMapping } from 'types/automations/index';
import { useEditorNodeState } from "./OptionManager";
import { InputList } from "components/Inputs/InputList";
@@ -15,6 +15,7 @@ export interface NodeEditorProps {
onFlags?: (isReady: boolean, isModified: boolean) => void;
saveBtnCreateText?: boolean;
isErrored?: boolean;
children?: ReactNode;
}
export const NodeEditor: FC<NodeEditorProps> = ({
+64 -10
View File
@@ -1,7 +1,10 @@
import "./index.css";
import { FC } from 'react';
import { createTheme, ThemeProvider } from '@mui/material/styles';
import { createRef, FC, ReactNode, useEffect, useRef } from 'react';
import { createTheme, ThemeProvider, useTheme } from '@mui/material/styles';
import { VersionBox } from "components/VersionBox";
import { SnackbarKey, SnackbarProvider, useSnackbar } from 'notistack';
import { Button } from "@mui/material";
import { useHAConnection } from 'haService/connection';
const theme = createTheme({
palette: {
@@ -9,15 +12,66 @@ const theme = createTheme({
},
});
export const InternalPage: FC<{
children: ReactNode
}> = ({ children }) => {
const conn = useHAConnection();
const theme = useTheme();
const snackbar = useSnackbar();
const snackbarKeyHAConKey = useRef<SnackbarKey | null>(null);
export const Page: FC = ({ children }) => {
useEffect(() => {
if (conn.status === 'error') {
if (snackbarKeyHAConKey.current) {
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
}
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Failed to connect to homeassistant due to "${JSON.stringify(conn.error)}"`, {
"variant": "error",
"persist": true,
})
} else if (conn.status === 'loading') {
if (snackbarKeyHAConKey.current) {
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
}
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Connecting to websocket...`, {
"variant": "info",
})
} else if (conn.status === "loaded") {
if (snackbarKeyHAConKey.current) {
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
}
}
}, [conn.status])
return <main className="page" style={{
color: theme.palette.text.primary,
background: theme.palette.background.default,
}}>
<VersionBox />
{children}
</main>
}
export const Page: FC<{
children: ReactNode
}> = ({ children }) => {
const notistackRef = createRef<any>();
const onClickDismiss = (key: SnackbarKey) => () => {
notistackRef.current.closeSnackbar(key);
}
return <ThemeProvider theme={theme}>
<main className="page" style={{
color: theme.palette.text.primary,
background: theme.palette.background.default,
}}>
<VersionBox />
{children}
</main>
<SnackbarProvider
anchorOrigin={{
"vertical": "bottom",
"horizontal": "center"
}}
ref={notistackRef}
action={key => <Button onClick={onClickDismiss(key)}>Dismiss</Button>}
dense preventDuplicate
>
<InternalPage>
{children}
</InternalPage>
</SnackbarProvider>
</ThemeProvider>
}
+21
View File
@@ -0,0 +1,21 @@
import { Connection, getCollection } from "home-assistant-js-websocket";
import { DeviceRegistryItem, HassDevices } from './types';
export const fetchDeviceRegistry = (conn: Connection): Promise<Record<string, DeviceRegistryItem>> =>
conn.sendMessagePromise<HassDevices>({
"type": "config/device_registry/list"
}).then(
data =>
data.filter(
({ disabled_by }) => !disabled_by
).reduce<Record<string, DeviceRegistryItem>>((all, n) => {
all[n.id] = n
return all
}, {}
))
export const deviceRegistryColl = (conn: Connection) => getCollection<Record<string, DeviceRegistryItem>>(
conn,
"_$drc",
fetchDeviceRegistry
)
+8
View File
@@ -0,0 +1,8 @@
import { Connection, getCollection } from "home-assistant-js-websocket";
import { HassEntitiesRegistry } from './types';
export const fetchEntityRegistry = (conn: Connection) => conn.sendMessagePromise<HassEntitiesRegistry>({
"type": "config/entity_registry/list"
}).then(data => data.filter(({ disabled_by }) => !disabled_by))
export const entityRegistryColl = (conn: Connection) => getCollection<HassEntitiesRegistry>(conn, "_$erc", fetchEntityRegistry)
@@ -0,0 +1,27 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { Page } from "components/Page";
import { useHAConnection } from './connection';
const Test: FC = () => {
const conn = useHAConnection();
return <code>
{JSON.stringify(conn, null, 4)}
</code>
}
export default {
title: 'Services/HA Service',
component: Test,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
}
} as ComponentMeta<typeof Test>
export const Base: ComponentStory<typeof Test> = props => {
return <Page>
<Test {...props} />
</Page>
};
+118
View File
@@ -0,0 +1,118 @@
import { useState, useEffect, useRef } from 'react';
import {
getAuth,
createConnection,
ERR_HASS_HOST_REQUIRED,
createLongLivedTokenAuth,
Auth,
Connection,
ERR_CANNOT_CONNECT,
ERR_CONNECTION_LOST,
ERR_INVALID_AUTH,
ERR_INVALID_HTTPS_TO_HTTP,
} from "home-assistant-js-websocket";
const HASS_URL = process.env.REACT_APP_HASS_URL as string;
const HASS_TOKEN = process.env.REACT_APP_HASS_TOKEN;
const HASS_SUPERVISOR_TOKEN = process.env.REACT_APP_SUPERVISOR_TOKEN as string;
export type HAConnection = {
status: 'loading'
} | {
status: 'loaded',
connection: Connection,
} | {
status: 'error',
error: any,
};
let haConnection: HAConnection = {
status: 'loading',
};
const translateErrorCodes = (errorCode: number) => {
if (errorCode === ERR_HASS_HOST_REQUIRED) {
return "Missing HASS host"
}
if (errorCode === ERR_CANNOT_CONNECT) {
return "Failed to connect"
}
if (errorCode === ERR_CONNECTION_LOST) {
return "Connection Lost"
}
if (errorCode === ERR_INVALID_AUTH) {
return "Invalid Host"
}
if (errorCode === ERR_INVALID_HTTPS_TO_HTTP) {
return "Invalid https to http"
}
return errorCode;
}
const createAuth = async () => {
let auth: Auth
if (HASS_TOKEN) {
return createLongLivedTokenAuth(HASS_URL, HASS_TOKEN);
}
if (HASS_SUPERVISOR_TOKEN) {
return await getAuth({ hassUrl: HASS_URL, authCode: HASS_SUPERVISOR_TOKEN });
}
try {
auth = await getAuth();
return auth
} catch (err) {
if (err !== ERR_HASS_HOST_REQUIRED) {
throw err
}
}
try {
auth = await getAuth({ hassUrl: HASS_URL });
return auth
} catch (err) {
throw err
}
}
async function startHAConnection() {
try {
const auth = await createAuth();
const connection = await createConnection({ auth });
haConnection = {
status: 'loaded',
connection,
}
return haConnection;
} catch (error) {
haConnection = {
status: 'error',
error: {
originalError: JSON.stringify(error),
message: translateErrorCodes(error as any),
hassToken: !HASS_TOKEN ? "no" : "yes",
hasSuperToken: !HASS_SUPERVISOR_TOKEN ? "no" : "yes",
url: HASS_URL,
},
}
throw error
}
}
startHAConnection().then(console.log).catch(console.error);
export const useHAConnection = (): HAConnection => {
const [conn, setConn] = useState<HAConnection>(haConnection);
const timeID = useRef<number | undefined>(undefined);
useEffect(() => {
if (conn.status !== haConnection.status) {
setConn(haConnection);
}
const waiter = () => {
if (conn.status !== haConnection.status) {
setConn(haConnection);
}
timeID.current = window.setTimeout(() => {
waiter()
}, conn.status === 'loading' ? 500 : 5000)
}
waiter()
return () => window.clearTimeout(timeID.current)
}, [conn, setConn])
return conn;
};
+42
View File
@@ -0,0 +1,42 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { Page } from "components/Page";
import { useHADeviceRegistry } from "haService";
import InputYaml from "components/Inputs/InputYaml";
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
const conn = useHADeviceRegistry();
onRender && onRender()
if (conn.ready) {
return <div>
{Object.keys(conn.collection.state).length} items
<ul style={{
maxHeight: '100vh',
overflow: 'auto'
}}>
{Object.keys(conn.collection.state).map(k => <li key={k}>
<b>{k}</b>
{/* <u>{conn.collection.state[k].length > 1 ? conn.collection.state[k].length : ''}</u> */}
<InputYaml value={conn.collection.state[k]} onChange={() => { }} label={k} />
</li>)}
</ul>
</div>
}
return <code>
Loading...
</code>
}
export default {
title: 'Services/Device Registry',
component: Test,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {}
} as ComponentMeta<typeof Test>
export const Base: ComponentStory<typeof Test> = props => {
return <Page>
<Test {...props} />
</Page>
};
+26
View File
@@ -0,0 +1,26 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { Page } from "components/Page";
import { useHAEntities } from "haService";
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
const conn = useHAEntities();
onRender && onRender()
return <code>
{JSON.stringify(conn, null, 4)}
</code>
}
export default {
title: 'Services/HA Entities',
component: Test,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {}
} as ComponentMeta<typeof Test>
export const Base: ComponentStory<typeof Test> = props => {
return <Page>
<Test {...props} />
</Page>
};
+45
View File
@@ -0,0 +1,45 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { Page } from "components/Page";
import { useHAEntityRegistry } from "haService";
import InputYaml from "components/Inputs/InputYaml";
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
const conn = useHAEntityRegistry();
onRender && onRender()
if (conn.ready) {
return <div>
{conn.collection.state.length}
<ul style={{
maxHeight: '100vh',
overflow: 'auto'
}}>
{conn.collection.state.map((row, i) => <li key={i}>
{/* {Object.keys(row).map(k => <>
<span key={k}>
<b>{k}</b>: {JSON.stringify(row[k] as any)}
</span><br key={`${k}-br`} />
</>)} */}
{/* <InputYaml label={String(i)} value={row} onChange={() => { }} /> */}
</li>)}
</ul>
</div>
}
return <code>
Loading...
</code>
}
export default {
title: 'Services/Entity Registry',
component: Test,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {}
} as ComponentMeta<typeof Test>
export const Base: ComponentStory<typeof Test> = props => {
return <Page>
<Test {...props} />
</Page>
};
+123
View File
@@ -0,0 +1,123 @@
import { entitiesColl, servicesColl } from "home-assistant-js-websocket"
import { deviceRegistryColl } from "./DeviceRegistry";
import { entityRegistryColl } from "./EntityRegistry";
import { DeviceRegistryItem } from "./types";
import { useHassCollection } from "./useHassCollection"
export type Option<T = {}> = string | ({
id: string,
label: string,
} & T)
export type EntityOption = Option<{ domain: string; }>
export type HAEntitiesState = ReturnType<typeof useHAEntities>;
export const useHAEntities = () => {
const entities = useHassCollection(entitiesColl, state => ({
domains: Array.from(new Set(Object.keys(state).map(x => x.split('.')[0])).keys()).sort(),
}));
const methods = {
getDomainList(): string[] {
return entities.additional?.domains ?? []
},
validateOptions(options: string[], restrictedDomains?: string[]): null | string[] {
if (restrictedDomains) {
const domains = restrictedDomains.map(x => x.toLowerCase())
const domainsStr = domains.length > 1 ?
`one of "${domains.join(', ')}"` :
`"${domains[0]}"`
return options.reduce<string[]>((all = [], key) => {
if (!domains.includes(key.toLowerCase().split('.')[0])) {
return [
...all,
`${methods.getLabel(key)} is not ${domainsStr}`
]
}
return all
}, [])
}
return null
},
getOptions(restrictToDomain?: string[]): EntityOption[] {
if (!entities.ready) {
return []
}
let keys = Object.keys(entities.collection.state);
if (restrictToDomain) {
const domains = restrictToDomain.map(x => x.toLowerCase())
keys = keys.filter(key => domains.includes(key.toLowerCase().split('.')[0]))
}
return keys.map(key => ({
id: key,
label: entities.collection.state[key].attributes.friendly_name ?? key,
domain: key.split('.')[0] ?? "n/a",
}))
},
getLabel: (opt: EntityOption): string => {
if (typeof opt === 'string') {
if (entities.ready) {
return entities.collection.state[opt]?.attributes.friendly_name ?? opt;
}
return opt
}
return opt.label ?? opt.id
},
getID: (opt: EntityOption): string => {
if (typeof opt === 'string') {
return opt
}
return opt.id
}
}
return {
...entities,
...methods
}
}
export const useHAServices = () => {
const services = useHassCollection(servicesColl);
return services
}
export type DeviceRegistryOption = Option<{ manufacturer: string }>;
export const useHADeviceRegistry = () => {
const dr = useHassCollection(deviceRegistryColl)
const getLabelForItem = (item: DeviceRegistryItem) => item ? item.name_by_user ??
item.name ??
item.id :
"";
const methods = {
getOptions(): DeviceRegistryOption[] {
if (!dr.ready) {
return []
}
const keys = Object.keys(dr.collection.state);
return keys.map(key => ({
id: key,
label: getLabelForItem(dr.collection.state[key]) ?? key,
manufacturer: dr.collection.state[key].manufacturer ?? "",
}))
},
getLabel: (opt: DeviceRegistryOption): string => {
if (typeof opt === 'string') {
if (dr.ready) {
return getLabelForItem(dr.collection.state[opt]) ?? opt
}
return opt
}
return opt.label ?? opt.id
},
getID: (opt: DeviceRegistryOption): string => {
if (typeof opt === 'string') {
return opt
}
return opt.id
}
}
return { ...dr, ...methods }
}
export const useHAEntityRegistry = () => {
const dr = useHassCollection(entityRegistryColl)
return dr
}
+40
View File
@@ -0,0 +1,40 @@
export type EntityRegisteryItem = {
area_id: string | null;
config_entry_id: string | null;
device_id: string | null;
disabled_by:
| "integration"
| "user"
| "config_entry"
| string
| null
;
entity_category:
| "diagnostic"
| "config"
| string
| null
;
hidden_by:
| "integration"
| "user"
| string
| null
;
icon: string | null;
name: string | null;
platform: string | null;
}
export type DeviceRegistryItem = {
id: string;
name: string;
name_by_user: string | null;
manufacturer: string | null;
entry_type: 'service' | string | null;
disabled_by: EntityRegisteryItem['disabled_by'];
area_id: string | null;
}
export type HassDevices = Array<DeviceRegistryItem>;
export type HassEntitiesRegistry = Array<EntityRegisteryItem>;
+59
View File
@@ -0,0 +1,59 @@
import { Collection, Connection } from "home-assistant-js-websocket";
import { useState, useEffect } from 'react';
import { useHAConnection } from "./connection";
type _HACollectionState<T> = {
ready: false,
collection?: Collection<T>,
} | {
ready: true,
collection: Collection<T>,
}
export type HACollectionState<T, D = {}> = _HACollectionState<T> & {
additional: Partial<D>
}
export const useHassCollection = <T, D extends {} = {}>(
getHACollection: (c: Connection) => Collection<T>,
updateAdditionalProps?: (n: T | {}) => D,
): HACollectionState<T, D> => {
const [state, setState] = useState<_HACollectionState<T>>({
ready: false
});
const conn = useHAConnection();
useEffect(() => {
if (conn.status === 'loaded' && !state.ready) {
const collection = getHACollection(conn.connection);
setState({
ready: false,
collection,
})
const unsub = collection.subscribe(d => {
if (d && !state.ready) {
setState({
ready: true,
collection,
})
unsub();
} else if (!d && state.ready) {
setState({
ready: true,
collection,
})
unsub();
}
});
return unsub
}
}, [conn, getHACollection, state.ready]);
return {
...state,
get additional(): Partial<D> {
if (state.ready && updateAdditionalProps) {
return updateAdditionalProps(state.collection.state)
}
return {}
}
}
}
+1
View File
@@ -4,3 +4,4 @@ import * as v from "types/validators/common";
export type AutomationTime = st.Infer<typeof v.AutomationTime>
export type AutomationTimeObject = st.Infer<typeof v.AutomationTimeObject>
export type AutomationTimeString = st.Infer<typeof v.AutomationTimeString>
export type EntityId = st.Infer<typeof v.EntityId>;
+3 -3
View File
@@ -46,10 +46,10 @@ export const FireEventAction = st.intersection([
export const DeviceAction = st.intersection([
AutomationActionNodeBase,
st.type({
type: st.string(),
device_id: st.string(),
type: st.optional(st.string()),
device_id: st.optional(st.string()),
entity_id: st.optional(st.string()),
domain: st.string(),
domain: st.optional(st.string()),
})
]);
+4 -3
View File
@@ -4,6 +4,7 @@ import { AutomationTimeString, AutomationTime, EntityId } from './common'
const AutomationTriggerBase = {
id: st.optional(st.string()),
enabled: st.optional(st.boolean()),
}
export const AutomationTriggerEvent = st.type({
@@ -95,9 +96,9 @@ export const AutomationTriggerDevice = st.type({
...AutomationTriggerBase,
platform: st.literal('device'),
entity_id: st.optional(EntityId),
device_id: st.string(),
domain: st.string(),
type: st.string(),
device_id: st.optional(st.string()),
domain: st.optional(st.string()),
type: st.optional(st.string()),
subtype: st.optional(st.string()),
})
+8 -1
View File
@@ -1,5 +1,5 @@
import { convertTimeToString, getDescriptionFromAutomationNode } from "./formatting";
import { convertTimeToString, getDescriptionFromAutomationNode, prettyName } from "./formatting";
test('converting time to a string', () => {
expect(convertTimeToString({ hours: 1 })).toEqual('01:00:00:00')
@@ -146,3 +146,10 @@ test('get State condition description', () => {
state: "on"
})).toEqual("switch.kitchen_light is 'on'")
})
test('pretty naming', () => {
expect(prettyName('sensor')).toEqual("Sensor")
expect(prettyName('sensor.phone')).toEqual("Sensor Phone")
expect(prettyName('device_tracker')).toEqual("Device Tracker")
})
+6 -1
View File
@@ -104,7 +104,7 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
return `Trigger ${node.event}`
}
if ('device_id' in node) {
return `${node.type} on ${node.device_id}`
return `${node.type ?? ""} on ${node.device_id ?? ""}`
}
if ('choose' in node) {
return "Choose"
@@ -121,3 +121,8 @@ export const prettyEntityId = (entityId: string | string[]) => {
return "..."
}
}
export const prettyName = (n: string) => {
const clean = n.replaceAll(/[.-_]/g, ' ');
return clean.split(' ').map(x => x.slice(0, 1).toUpperCase() + x.slice(1)).join(' ')
}
+3374 -3669
View File
File diff suppressed because it is too large. Load diff