cleaned up time trigger

This commit is contained in:
ari committed 2022-07-20 22:13:46 -04:00
1 parent ef02abe0cb
commit 3a44057a40
14 files changed
+536 -167

No files matched your search

@@ -10,6 +10,8 @@ export type InputEntityProps = InputAutoCompletePropsBase & {
restrictToDomain?: string[];
restrictedIntegrations?: string[];
preSelectedEntityIds?: string[];
restrictedDeviceClass?: string[];
restrictMode?: "and" | "or";
};
export const InputEntity: FC<InputEntityProps> = (props) => {
@@ -17,7 +19,9 @@ export const InputEntity: FC<InputEntityProps> = (props) => {
const entities = useHAEntities();
let options = entities.getOptions(
props.restrictToDomain,
props.restrictedIntegrations
props.restrictedIntegrations,
props.restrictedDeviceClass,
props.restrictMode ?? "and"
);
if (props.preSelectedEntityIds) {
options = options.filter((opt) =>
@@ -6,29 +6,35 @@ import { AutomationTime } from "types/automations/common";
import { InputTime } from "./InputTime";
export default {
title: 'Inputs/InputTime',
title: "Inputs/InputTime",
component: InputTime,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
} as ComponentMeta<typeof InputTime>;
const Template: ComponentStory<typeof InputTime> = args => {
const Template: ComponentStory<typeof InputTime> = (args) => {
const [value, setValue] = useState<AutomationTime | undefined>(undefined);
return <Page>
<div style={{
padding: '1em'
}}>
<InputTime {...args} value={value} onChange={t => {
setValue(t)
args.onChange(t)
}} />
</div>
</Page>
}
return (
<Page>
<div
style={{
padding: "1em",
}}
>
<InputTime
{...args}
value={args.restrictEmpty ? "00:00:00" : value}
onChange={(t) => {
setValue(t);
args.onChange(t);
}}
/>
</div>
</Page>
);
};
export const SimpleText = Template.bind({})
export const SimpleText = Template.bind({});
SimpleText.args = {
label: "Time Stamp",
value: "10"
}
value: "10",
};
+11 -8
View File
@@ -19,13 +19,14 @@ const fields: Array<keyof AutomationTimeObject> = [
"seconds",
"milliseconds",
];
export interface Props {
export type InputTimeProps = {
label: string;
value?: AutomationTime;
onChange: (v?: AutomationTimeObject) => void;
className?: string;
}
export const InputTime: FC<Props> = (props) => {
value?: AutomationTime;
restrictEmpty?: boolean;
};
export const InputTime: FC<InputTimeProps> = (props) => {
// state
const [disabled, setDisabled] = useState(!props.value);
const [displayValue, setDisplayValue] = useState(
@@ -140,10 +141,12 @@ export const InputTime: FC<Props> = (props) => {
onChange={(e) => updateOne(name)(e.target.value)}
/>
))}
<ButtonIcon
onClick={() => setDisabled(!disabled)}
icon={disabled ? <EditIcon /> : <CloseIcon />}
/>
{!props.restrictEmpty && (
<ButtonIcon
onClick={() => setDisabled(!disabled)}
icon={disabled ? <EditIcon /> : <CloseIcon />}
/>
)}
</div>
</div>
);
@@ -0,0 +1,82 @@
.trigger-time--help {
margin-top: 0.5em;
display: flex;
flex-direction: row;
gap: 0.5em;
flex-wrap: wrap;
justify-content: flex-start;
align-items: center;
}
.trigger-time--help .text {
word-wrap: break-word;
flex-wrap: wrap;
overflow: hidden;
text-overflow: clip;
cursor: pointer;
padding: 0.5em 0.75em;
max-width: 40em;
}
.trigger-time--help .text a {
color: var(--mui-info-light);
}
.trigger-time--help .text a:hover {
color: var(--mui-info-main);
border-radius: 10px;
text-decoration: underline;
}
.trigger-time--help .trigger-time--mode-selection {
width: 10em;
}
.trigger-time--pattern {
display: flex;
flex-direction: row;
gap: 0.5em;
margin-top: 0.5em;
}
.trigger-time--exact {
display: flex;
flex-direction: column;
align-items: center;
gap: 0.25em;
}
.trigger-time--exact .add {
border-color: var(--mui-info-light);
color: var(--mui-info-contrastText);
background-color: var(--mui-info-main);
}
.trigger-time--exact .add:hover {
border-color: var(--mui-info-light);
color: var(--mui-info-main);
background-color: var(--mui-info-contrastText);
}
.trigger-time--exact--option {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding-top: 0.5em;
gap: 0.5em;
}
.trigger-time--exact--option button.MuiButtonBase-root {
border-color: var(--mui-info-light);
background-color: var(--mui-info-main);
color: var(--mui-info-contrastText);
}
.trigger-time--exact--option button.MuiButtonBase-root:hover {
background-color: var(--mui-info-light);
}
.trigger-time--exact--option .input-autocomplete {
min-width: 10em;
}
@@ -1,25 +1,199 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerTime } from 'types/automations/triggers';
import { InputTime } from 'components/Inputs/InputTime';
import { convertObjectToAutomationTimeString } from 'utils/time';
import "./TriggerTime.css";
import HelpOutlinedIcon from "@mui/icons-material/HelpOutlined";
import AccessTimeOutlinedIcon from "@mui/icons-material/AccessTimeOutlined";
import MoreTimeOutlinedIcon from "@mui/icons-material/MoreTimeOutlined";
import { OptionManager } from "./OptionManager";
import {
AutomationTriggerTime,
AutomationTriggerExactTime,
AutomationTriggerTimePattern,
} from "types/automations/triggers";
import { InputTime } from "components/Inputs/InputTime";
import {
convertObjectToAutomationTimeString,
isAutomationTimeString24Hours,
} from "utils/time";
import InputText from "components/Inputs/InputText";
import { FC } from "react";
import { InputList } from "components/Inputs/InputList";
import { InputEntity } from "components/Inputs/InputEntities";
import { Button } from "components/Inputs/Button";
import { useState } from "react";
import AddIcon from "@mui/icons-material/Add";
import { ButtonIcon } from "components/Icons/ButtonIcons";
export const TriggerTime: OptionManager<AutomationTriggerTime> = {
defaultState: () => ({
"platform": 'time',
"at": "",
platform: "time",
at: "00:00:00",
}),
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputTime
label="At"
value={state.at}
onChange={_at => setState({
...state,
at: _at ? convertObjectToAutomationTimeString(_at) : "00:00:00",
})}
Component: ({ state, setState }) => {
const [showHelp, setHelp] = useState(false);
const setTimeType = (t: AutomationTriggerTime["platform"]) => {
if (t === "time") {
setState({
platform: "time",
at: ["00:00:00"],
});
} else {
setState({
platform: "time_pattern",
});
}
};
return (
<>
<div className="trigger-time--help">
<InputList
className="trigger-time--mode-selection"
label="Mode"
current={state.platform}
onChange={setTimeType}
options={["time", "time_pattern"]}
/>
{state.platform === "time_pattern" && (
<>
<Button onClick={() => setHelp(!showHelp)}>
<HelpOutlinedIcon /> Help
</Button>
</>
)}
{state.platform === "time_pattern" && showHelp && (
<div className="text">
You can prefix the value with a "/" to match whenever the value is
divisible by that number. You can specify "*" to match any value.{" "}
<a
href="https://www.home-assistant.io/docs/automation/trigger/#time-pattern-trigger"
target="_blank"
>
More Info.
</a>
</div>
)}
</div>
{state.platform === "time_pattern" ? (
<TriggerTimePattern state={state as any} setState={setState} />
) : (
<TriggerExactTime state={state as any} setState={setState} />
)}
</>
);
},
};
export const TriggerExactTime: FC<{
state: AutomationTriggerExactTime;
setState: (t: AutomationTriggerExactTime) => void;
}> = ({ state, setState }) => {
const times = Array.isArray(state.at) ? state.at : [state.at];
const update = (t: string, i: number) =>
setState({
...state,
at: [...times.slice(0, i), t, ...times.slice(i + 1)],
});
const add = () =>
setState({
...state,
at: [...times, "00:00:00"],
});
return (
<div className="trigger-time--exact">
{times.map((v, i) => {
let editor: JSX.Element;
const is24Hour = isAutomationTimeString24Hours(v);
if (is24Hour) {
editor = (
<InputTime
key={`${i}-editor`}
label={`#${i + 1} - At`}
value={v ?? "00:00:00"}
restrictEmpty
onChange={(_at) =>
update(
_at ? convertObjectToAutomationTimeString(_at) : "00:00:00",
i
)
}
/>
);
} else {
editor = (
<InputEntity
key={`${i}-editor`}
label="Time Entity"
restrictMode="or"
restrictedDeviceClass={["timestamp"]}
restrictToDomain={["input_datetime"]}
value={v}
multiple={false}
onChange={(_at) => update(_at ?? "", i)}
/>
);
}
return (
<div className="trigger-time--exact--option">
{editor}{" "}
<ButtonIcon
icon={
is24Hour ? <AccessTimeOutlinedIcon /> : <MoreTimeOutlinedIcon />
}
onClick={() => {
if (is24Hour) {
update("", i);
} else {
update("00:00:00", i);
}
}}
/>
</div>
);
})}
<Button onClick={add} className="add">
<AddIcon />
</Button>
</div>
);
};
export const TriggerTimePattern: FC<{
state: AutomationTriggerTimePattern;
setState: (t: AutomationTriggerTimePattern) => void;
}> = ({ state, setState }) => {
return (
<div className="trigger-time--pattern">
<InputText
label="Hours"
value={state.hours ?? ""}
onChange={(hours) =>
setState({
...state,
hours,
})
}
/>
</>
}
}
<InputText
label="Minutes"
value={state.minutes ?? ""}
onChange={(minutes) =>
setState({
...state,
minutes,
})
}
/>
<InputText
label="Seconds"
value={state.seconds ?? ""}
onChange={(seconds) =>
setState({
...state,
seconds,
})
}
/>
</div>
);
};
@@ -1,27 +0,0 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerTimePattern } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
defaultState: () => ({
"platform": 'time_pattern',
}),
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputText label="Hours" value={state.hours ?? ""} onChange={hours => setState({
...state,
hours
})} />
<InputText label="Minutes" value={state.minutes ?? ""} onChange={minutes => setState({
...state,
minutes
})} />
<InputText label="Seconds" value={state.seconds ?? ""} onChange={seconds => setState({
...state,
seconds
})} />
</>
}
}
@@ -15,7 +15,6 @@ import { TriggerNumericState } from "./TriggerNumericState";
import { TriggerState } from "./TriggerState";
import { TriggerTemplate } from "./TriggerTemplate";
import { TriggerTime } from "./TriggerTime";
import { TriggerTimePattern } from "./TriggerTimePattern";
import { TriggerWebhook } from "./TriggerWebhook";
import { TriggerZone } from "./TriggerZone";
import { TriggerDevice } from "./TriggerDevice";
@@ -67,8 +66,6 @@ export const getOptionManager = <T extends AutomationNodeTypes>(
return TriggerTemplate;
case "time":
return TriggerTime;
case "time_pattern":
return TriggerTimePattern;
case "webhook":
return TriggerWebhook;
case "zone":