input entities
This commit is contained in:
1 parent
878035e748
commit
996626f9af
27 files changed
+596
-92
No files matched your search
@@ -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
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
.input-entities .BaseBadge-root {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.input-entities--list, .input-entities--chip>span {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 0.15em;
|
||||
}
|
||||
|
||||
.input-entities--list>small::before, .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,181 @@
|
||||
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 parse from 'autosuggest-highlight/parse';
|
||||
import match from 'autosuggest-highlight/match';
|
||||
import { EntityId } from 'types/automations/common';
|
||||
import { Badge } from "@mui/material";
|
||||
|
||||
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>
|
||||
}
|
||||
/>
|
||||
}
|
||||
|
||||
|
||||
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-entities--list'].join(' ')}>
|
||||
<b><HighlightElm text={label} searchTerm={searchTerm} /></b> <small>
|
||||
<HighlightElm text={id} searchTerm={searchTerm} />
|
||||
</small>
|
||||
</li>
|
||||
@@ -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
|
||||
@@ -0,0 +1,28 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
import { SearchItem } from "./InputEntities";
|
||||
|
||||
export default {
|
||||
title: 'Inputs/InputEntity/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
|
||||
@@ -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')
|
||||
|
||||
@@ -5,28 +5,36 @@ 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 +50,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,3 +1,4 @@
|
||||
import { InputEntity } from "components/Inputs/InputEntities";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import { DeviceAction } from "types/automations/actions";
|
||||
import { OptionManager, updateActionData } from './OptionManager';
|
||||
@@ -39,9 +40,7 @@ export const ActionDeviceState: OptionManager<DeviceAction> = {
|
||||
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] })}
|
||||
/>
|
||||
|
||||
@@ -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,24 +1,20 @@
|
||||
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';
|
||||
|
||||
|
||||
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||
defaultState: () => ({
|
||||
"platform": 'device',
|
||||
"domain": "",
|
||||
"type": "",
|
||||
"subtype": "",
|
||||
"device_id": "",
|
||||
"entity_id": "",
|
||||
}),
|
||||
isReady: () => true,
|
||||
renderOptionList: (state, setState) => {
|
||||
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,
|
||||
@@ -32,7 +28,7 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||
...state,
|
||||
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
|
||||
})} />
|
||||
|
||||
@@ -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';
|
||||
@@ -17,6 +17,7 @@ export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> =
|
||||
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';
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ export const TriggerState: OptionManager<AutomationTriggerState> = {
|
||||
return <>
|
||||
<InputEntity
|
||||
value={state.entity_id}
|
||||
multiple
|
||||
onChange={entity_id => setState({
|
||||
...state,
|
||||
entity_id
|
||||
|
||||
@@ -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> = {
|
||||
@@ -15,9 +14,9 @@ export const TriggerZone: OptionManager<AutomationTriggerZone> = {
|
||||
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"
|
||||
@@ -28,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 => {
|
||||
|
||||
|
||||
@@ -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>
|
||||
};
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useState } from 'react';
|
||||
import { useState, useEffect, useRef } from 'react';
|
||||
import {
|
||||
getAuth,
|
||||
createConnection,
|
||||
@@ -6,8 +6,11 @@ import {
|
||||
createLongLivedTokenAuth,
|
||||
Auth,
|
||||
Connection,
|
||||
ERR_CANNOT_CONNECT,
|
||||
ERR_CONNECTION_LOST,
|
||||
ERR_INVALID_AUTH,
|
||||
ERR_INVALID_HTTPS_TO_HTTP,
|
||||
} from "home-assistant-js-websocket";
|
||||
import { useDelayEffect } from 'utils/useDelay';
|
||||
|
||||
const HASS_URL = process.env.REACT_APP_HASS_URL as string;
|
||||
const HASS_TOKEN = process.env.REACT_APP_HASS_TOKEN;
|
||||
@@ -24,6 +27,25 @@ 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 () => {
|
||||
console.log("detecting auth")
|
||||
let auth: Auth
|
||||
@@ -61,7 +83,7 @@ async function startHAConnection() {
|
||||
} catch (error) {
|
||||
haConnection = {
|
||||
status: 'error',
|
||||
error,
|
||||
error: translateErrorCodes(error),
|
||||
}
|
||||
throw error
|
||||
}
|
||||
@@ -70,10 +92,24 @@ async function startHAConnection() {
|
||||
startHAConnection().then(console.log).catch(console.error);
|
||||
export const useHAConnection = (): HAConnection => {
|
||||
const [conn, setConn] = useState<HAConnection>(haConnection);
|
||||
useDelayEffect(() => {
|
||||
const timeID = useRef<number | undefined>(undefined);
|
||||
console.log("connecting to HA")
|
||||
useEffect(() => {
|
||||
console.log('connection state', conn.status)
|
||||
if (conn.status !== haConnection.status) {
|
||||
setConn(haConnection);
|
||||
}
|
||||
}, [conn], conn.status === 'loading' ? 500 : 50000);
|
||||
const waiter = () => {
|
||||
if (conn.status !== haConnection.status) {
|
||||
console.log('setting status', 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;
|
||||
};
|
||||
@@ -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>
|
||||
};
|
||||
@@ -1,13 +1,77 @@
|
||||
import { entitiesColl, servicesColl } from "home-assistant-js-websocket"
|
||||
import { useHassCollection } from "./useHassCollection"
|
||||
|
||||
export type Option = string | {
|
||||
id: string,
|
||||
label: string,
|
||||
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[]): Option[] {
|
||||
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: Option): 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: Option): string => {
|
||||
if (typeof opt === 'string') {
|
||||
return opt
|
||||
}
|
||||
return opt.id
|
||||
}
|
||||
}
|
||||
return {
|
||||
...entities,
|
||||
...methods
|
||||
}
|
||||
}
|
||||
|
||||
export const useHAService = () => {
|
||||
const entities = useHassCollection(entitiesColl);
|
||||
export const useHAServices = () => {
|
||||
const services = useHassCollection(servicesColl);
|
||||
|
||||
return {
|
||||
entities,
|
||||
services,
|
||||
}
|
||||
return services
|
||||
}
|
||||
@@ -9,7 +9,10 @@ export type HACollectionState<T> = {
|
||||
ready: true,
|
||||
collection: Collection<T>,
|
||||
}
|
||||
export const useHassCollection = <T>(getHACollection: (c: Connection) => Collection<T>) => {
|
||||
export const useHassCollection = <T, D extends {} = {}>(
|
||||
getHACollection: (c: Connection) => Collection<T>,
|
||||
updateAdditionalProps?: (n: T | {}) => D,
|
||||
) => {
|
||||
const [state, setState] = useState<HACollectionState<T>>({
|
||||
ready: false
|
||||
});
|
||||
@@ -22,21 +25,32 @@ export const useHassCollection = <T>(getHACollection: (c: Connection) => Collect
|
||||
ready: false,
|
||||
collection,
|
||||
})
|
||||
return collection.subscribe(d => {
|
||||
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;
|
||||
return {
|
||||
...state,
|
||||
get additional(): Partial<D> {
|
||||
if (state.ready && updateAdditionalProps) {
|
||||
return updateAdditionalProps(state.collection.state)
|
||||
}
|
||||
return {}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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>;
|
||||
@@ -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()),
|
||||
})
|
||||
|
||||
|
||||
@@ -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")
|
||||
})
|
||||
@@ -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(' ')
|
||||
}
|
||||
Reference in new issue
Block a user