removed $smType for conditions and trigger

This commit is contained in:
ari committed 2022-05-13 17:26:44 -04:00
1 parent 49fea3fabd
commit 429dfd5b50
41 files changed
+410 -723

No files matched your search

@@ -12,48 +12,32 @@ export default {
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
const [state, setState] = useState<AutomationCondition>({
"$smType": "condition",
"condition": "or",
"condition_data": {
"conditions": [
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": [
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
}
},
{
"$smType": "condition",
"condition": "template",
"condition_data": {
"value_template": "states('switch.kitchen') == 'on'"
}
}
]
}
},
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_temperature"
"sensor.kitchen_humidity"
],
"above": "51"
"above": "40"
},
{
"condition": "template",
"value_template": "states('switch.kitchen') == 'on'"
}
}
]
}
]
},
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_temperature"
],
"above": "51"
}
]
})
return (
<div className="page">
@@ -3,7 +3,7 @@ import { FC, useState, useEffect } from 'react';
import { getConditionDefaultValues } from "utils/defaults";
import { AutomationCondition } from "types/automations/conditions";
import { CheckMarkIcon, PencilIcon } from "components/Icons";
import InputList from "components/Inputs/InputList";
import { InputList } from "components/Inputs/InputList";
import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender";
import { useStyles } from "./style";
@@ -51,17 +51,10 @@ export const ConditionNode: FC<{
) {
onUpdate({
...condition,
$smType: 'condition',
condition_data: {
...condition.condition_data,
conditions: condition.condition_data.conditions.concat({
$smType: 'condition',
condition: 'or',
condition_data: {
conditions: []
}
})
}
conditions: condition.conditions.concat({
condition: 'or',
conditions: []
})
})
}
}
@@ -69,20 +62,10 @@ export const ConditionNode: FC<{
let childrenConditions: JSX.Element;
if (effectiveDM) {
const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={data => {
onUpdate({
...data,
$smType: 'condition',
})
}} />
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
} else {
const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={data => {
onUpdate({
...data,
$smType: 'condition',
})
}} />
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
}
// styles
let hasChildren = false;
@@ -115,13 +98,10 @@ export const ConditionNode: FC<{
'trigger',
'zone',
]}
onChange={n => onUpdate({
$smType: 'condition',
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
condition_data: {
...getConditionDefaultValues(n),
...condition.condition_data,
}
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
@@ -134,11 +114,8 @@ export const ConditionNode: FC<{
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition.condition_data}
onChange={update => onUpdate({
...condition,
condition_data: update as any
})}
value={condition}
onChange={update => onUpdate(update as any)}
resizable
/>}
{!yamlMode && childrenConditions}
@@ -46,19 +46,13 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputTextArea label="Template" value={condition.condition_data.value_template} onChange={value_template => onChange({
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
...condition,
condition_data: {
...condition.condition_data,
value_template
}
value_template
})} resizable />
</div>
}
@@ -69,58 +63,40 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
condition_data: {
...condition.condition_data,
attribute
}
attribute
})} />
<InputNumber
label="Above"
value={condition.condition_data.above ? Number(condition.condition_data.above) : undefined}
value={condition.above ? Number(condition.above) : undefined}
onChange={above => onChange({
...condition,
condition_data: {
...condition.condition_data,
above: above ? String(above) : undefined,
}
above: above ? String(above) : undefined,
})}
/>
<InputNumber
label="Below"
value={condition.condition_data.below ? Number(condition.condition_data.below) : undefined}
value={condition.below ? Number(condition.below) : undefined}
onChange={below => onChange({
...condition,
condition_data: {
...condition.condition_data,
below: below ? String(below) : undefined,
}
below: below ? String(below) : undefined,
})}
/>
<InputTextArea label="Template" value={condition.condition_data.value_template ?? ""} onChange={value_template => onChange({
<InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
...condition,
condition_data: {
...condition.condition_data,
value_template
}
value_template
})} resizable />
</div>
}
@@ -132,7 +108,7 @@ export const LogicViewer: Editor<LogicCondition> = ({
}) => {
return <>
{condition.condition_data.conditions.map((c, i) => {
{condition.conditions.map((c, i) => {
return <ConditionNode
key={i}
condition={c}
@@ -151,50 +127,35 @@ export const StateEditor: Editor<StateCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
condition_data: {
...condition.condition_data,
attribute
}
attribute
})} />
<InputText
label="State"
value={String(condition.condition_data.state)}
value={String(condition.state)}
onChange={state => onChange({
...condition,
condition_data: {
...condition.condition_data,
state,
}
state,
})}
/>
<InputTime
label="For"
value={condition.condition_data.for}
value={condition.for}
onChange={_for => onChange({
...condition,
condition_data: {
...condition.condition_data,
for: _for,
}
for: _for,
})}
/>
</div>
@@ -205,36 +166,27 @@ export const TimeEditor: Editor<TimeCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputTime
label="After"
value={condition.condition_data.after}
value={condition.after}
onChange={after => onChange({
...condition,
condition_data: {
...condition.condition_data,
after,
}
after,
})}
/>
<InputTime
label="Before"
value={condition.condition_data.before}
value={condition.before}
onChange={before => onChange({
...condition,
condition_data: {
...condition.condition_data,
before,
}
before,
})}
/>
<b>Weekday not support for no, use yaml for now</b> {condition.condition_data.weekday}
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
</div>
}
@@ -243,19 +195,13 @@ export const TriggerEditor: Editor<TriggerCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputText label="Trigger ID" value={condition.condition_data.id} onChange={id => onChange({
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
...condition,
condition_data: {
...condition.condition_data,
id
}
id
})} />
</div>
}
@@ -265,39 +211,27 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputText label="Zone" value={condition.condition_data.zone} onChange={zone => onChange({
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
...condition,
condition_data: {
...condition.condition_data,
zone
}
zone
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText
label="State"
value={String(condition.condition_data.state)}
value={String(condition.state)}
onChange={state => onChange({
...condition,
condition_data: {
...condition.condition_data,
state,
}
state,
})}
/>
</div>
@@ -27,11 +27,8 @@ const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }
export const TemplateViewer = Template.bind({})
TemplateViewer.args = {
condition: {
$smType: 'condition',
condition: 'template',
condition_data: {
value_template: "states('switch.light_kitchen') == 'on'"
}
value_template: "states('switch.light_kitchen') == 'on'"
} as AutomationCondition,
}
@@ -39,63 +36,42 @@ TemplateViewer.args = {
export const NumericStateViewer = Template.bind({})
NumericStateViewer.args = {
condition: {
$smType: 'condition',
condition: "numeric_state",
condition_data: {
entity_id: "sensor.humidity_kitchen",
above: "10",
}
entity_id: "sensor.humidity_kitchen",
above: "10",
} as AutomationCondition,
}
export const LogicCondition = Template.bind({})
LogicCondition.args = {
condition: {
$smType: 'condition',
condition: 'or',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_kitchen',
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_kitchen',
above: '60'
},
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_living_room',
above: '60'
},
{
condition: 'and',
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_bedroom',
above: '60'
},
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_bathroom',
above: '60'
}
},
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_living_room',
above: '60'
}
},
{
$smType: 'condition',
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_bedroom',
above: '60'
}
},
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_bathroom',
above: '60'
}
}
]
}
},
]
}
]
},
]
} as AutomationCondition,
}
@@ -2,30 +2,24 @@ import { AutomationCondition, LogicCondition } from "types/automations/condition
export const genUpdateMethods = (
condition: LogicCondition,
onChange: (c: LogicCondition) => void
condition: LogicCondition,
onChange: (c: LogicCondition) => void
) => (i: number) => ({
onUpdate: (update: AutomationCondition) => onChange({
...condition,
condition_data: {
...condition.condition_data,
conditions: [
...condition.condition_data.conditions.slice(0, i),
update,
...condition.condition_data.conditions.slice(i+1)
]
}
conditions: [
...condition.conditions.slice(0, i),
update,
...condition.conditions.slice(i + 1)
]
}),
onDelete: (which: 'root' | number) => {
if (which === 'root') {
onChange({
...condition,
condition_data: {
...condition.condition_data,
conditions: condition.condition_data.conditions.slice(0, i).concat(
condition.condition_data.conditions.slice(i+1)
)
}
conditions: condition.conditions.slice(0, i).concat(
condition.conditions.slice(i + 1)
)
})
} else {
throw new Error("Not Implemented")
@@ -34,7 +34,7 @@ export const LogicViewer: Viewer<LogicCondition> = ({
onChange,
}) => {
return <>
{condition.condition_data.conditions.map((c, i) => {
{condition.conditions.map((c, i) => {
return <ConditionNode key={i} condition={c} displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>