From 029df7932e9023e0d51f7c1ec38a9a308d0eccdd Mon Sep 17 00:00:00 2001 From: Ari Date: Fri, 17 Jun 2022 13:37:25 -0400 Subject: [PATCH] device action builder --- .../Inputs/InputAutoComplete.test.ts | 10 + .../components/Inputs/InputAutoComplete.tsx | 2 +- .../src/components/Inputs/InputEntities.tsx | 58 ++- webapp/src/components/Inputs/InputList.tsx | 4 + .../NodeEditor/OptionManager/ActionDevice.tsx | 99 +++-- .../OptionManager/ActionService.tsx | 2 +- .../NodeEditor/OptionManager/OptionManager.ts | 80 ++-- .../NodeEditor/OptionManager/TriggerState.tsx | 2 +- .../NodeEditor/OptionManager/index.tsx | 9 +- .../components/NodeEditor/index.stories.tsx | 11 + webapp/src/haService/extras.ts | 84 ++++ webapp/src/haService/index.ts | 13 +- webapp/src/haService/types.ts | 59 ++- webapp/src/types/validators/actions.ts | 109 +++-- webapp/src/utils/formatting.test.ts | 373 +++++++++++------- webapp/src/utils/formatting.ts | 244 ++++++------ 16 files changed, 725 insertions(+), 434 deletions(-) create mode 100644 webapp/src/haService/extras.ts diff --git a/webapp/src/components/Inputs/InputAutoComplete.test.ts b/webapp/src/components/Inputs/InputAutoComplete.test.ts index dc92536..47d2489 100644 --- a/webapp/src/components/Inputs/InputAutoComplete.test.ts +++ b/webapp/src/components/Inputs/InputAutoComplete.test.ts @@ -11,3 +11,13 @@ test("similarity score", () => { ].map((x) => computeSimilarity(x, "light.balcony", "Balcony Light")); expect(searchTerms).toStrictEqual(searchTerms.sort()); }); + +test("similarity score", () => { + expect( + computeSimilarity( + "li", + "6592b3d6d05d3de6fa26c3dbd2edecc2", + "Balcony Lights" + ) + ).toBeGreaterThan(0); +}); diff --git a/webapp/src/components/Inputs/InputAutoComplete.tsx b/webapp/src/components/Inputs/InputAutoComplete.tsx index 9c3a87c..055ab30 100644 --- a/webapp/src/components/Inputs/InputAutoComplete.tsx +++ b/webapp/src/components/Inputs/InputAutoComplete.tsx @@ -51,7 +51,7 @@ export function computeSimilarity( if (lowCaseId.includes(segment)) { similarityScore += lowCaseId.length / lowCaseId.length; } - if (lowCaseId.includes(segment)) { + if (lowCaseLabel.includes(segment)) { similarityScore += lowCaseLabel.length / lowCaseLabel.length; } } diff --git a/webapp/src/components/Inputs/InputEntities.tsx b/webapp/src/components/Inputs/InputEntities.tsx index c3ba54b..2c10060 100644 --- a/webapp/src/components/Inputs/InputEntities.tsx +++ b/webapp/src/components/Inputs/InputEntities.tsx @@ -1,22 +1,48 @@ import { FC } from "react"; -import { useHAEntities } from 'haService'; -import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete'; +import { useHAEntities } from "haService"; +import { + InputAutoComplete, + InputAutoCompletePropsBase, +} from "./InputAutoComplete"; import { prettyName } from "utils/formatting"; export type InputEntityProps = InputAutoCompletePropsBase & { - restrictToDomain?: string[], -} + restrictToDomain?: string[]; + preSelectedEntityIds?: string[]; +}; -export const InputEntity: FC = props => { - // state - const entities = useHAEntities(); - return entities.validateOptions(v, props.restrictToDomain)} - options={entities.getOptions(props.restrictToDomain)} - getID={entities.getID} - getLabel={entities.getLabel} - groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''} +export const InputEntity: FC = (props) => { + // state + const entities = useHAEntities(); + let options = entities.getOptions(props.restrictToDomain); + if (props.preSelectedEntityIds) { + options = options.filter((opt) => + props.preSelectedEntityIds?.includes(entities.getID(opt)) + ); + } + const validateOptions = (v: string[]): null | string[] => { + const errors: string[] = []; + if (props.preSelectedEntityIds) { + v.forEach((eid) => { + if (!props.preSelectedEntityIds?.includes(eid)) { + errors.push(`"${eid}" is not a valid selection`); + } + }); + } + errors.concat(entities.validateOptions(v, props.restrictToDomain) ?? []); + if (errors.length > 0) { + return errors; + } + return null; + }; + return ( + (typeof opt !== "string" ? prettyName(opt.domain) : "")} /> -} - + ); +}; diff --git a/webapp/src/components/Inputs/InputList.tsx b/webapp/src/components/Inputs/InputList.tsx index a2a9101..b83dc0e 100644 --- a/webapp/src/components/Inputs/InputList.tsx +++ b/webapp/src/components/Inputs/InputList.tsx @@ -19,6 +19,7 @@ export type Props = { title?: string; helperText?: string; endAdornment?: ReactNode; + disabled?: boolean; }; export function InputList({ current, @@ -33,6 +34,7 @@ export function InputList({ title, helperText, endAdornment, + disabled, }: Props) { const invalidCurrent = current && !options.map(getKey).includes(getKey(current)); @@ -42,6 +44,7 @@ export function InputList({ variant="filled" sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }} fullWidth + disabled={disabled} > {label}