added condition editor for device
This commit is contained in:
1 parent
1ce934fd54
commit
618a62affe
9 files changed
+387
-256
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { Classes } from "jss";
|
||||
import { FC, useState, useEffect } from 'react';
|
||||
import { FC, useState, useEffect } from "react";
|
||||
import { getConditionDefaultValues } from "utils/defaults";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { CheckMarkIcon, PencilIcon } from "components/Icons";
|
||||
@@ -10,126 +10,151 @@ import { useStyles } from "./style";
|
||||
import { getViewer } from "./viewRender";
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
import { useHA } from "haService";
|
||||
|
||||
|
||||
import { getSubTypeList } from "utils/automations";
|
||||
|
||||
export const ConditionNode: FC<{
|
||||
condition: AutomationCondition;
|
||||
displayMode: boolean;
|
||||
showDelete?: boolean;
|
||||
onDelete?: (which: 'root' | number) => void;
|
||||
onDelete?: (which: "root" | number) => void;
|
||||
onUpdate?: (data: AutomationCondition) => void;
|
||||
children?: (props: {
|
||||
classes: Classes<string>
|
||||
}) => JSX.Element,
|
||||
children?: (props: { classes: Classes<string> }) => JSX.Element;
|
||||
}> = ({
|
||||
condition,
|
||||
showDelete = false,
|
||||
displayMode = true,
|
||||
onDelete = () => { },
|
||||
onUpdate = () => { },
|
||||
children = () => { },
|
||||
onDelete = () => {},
|
||||
onUpdate = () => {},
|
||||
children = () => {},
|
||||
}) => {
|
||||
// state
|
||||
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
||||
const [yamlMode, setYamlMode] = useState(false);
|
||||
const { isMobile } = useWindowSize();
|
||||
const { namer } = useHA();
|
||||
// alias
|
||||
const effectiveDM = internalDisplayMode || yamlMode;
|
||||
// effect
|
||||
useEffect(() => {
|
||||
setInternalDisplayMode(displayMode);
|
||||
}, [displayMode])
|
||||
useEffect(() => {
|
||||
if (yamlMode) {
|
||||
setInternalDisplayMode(true);
|
||||
}
|
||||
}, [yamlMode])
|
||||
// alias
|
||||
const onAddChild = () => {
|
||||
if (
|
||||
(condition.condition === 'and') ||
|
||||
(condition.condition === 'or') ||
|
||||
(condition.condition === 'not')
|
||||
) {
|
||||
onUpdate({
|
||||
...condition,
|
||||
conditions: condition.conditions.concat({
|
||||
condition: 'or',
|
||||
conditions: []
|
||||
})
|
||||
})
|
||||
}
|
||||
// state
|
||||
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
||||
const [yamlMode, setYamlMode] = useState(false);
|
||||
const { isMobile } = useWindowSize();
|
||||
const ha = useHA();
|
||||
// alias
|
||||
const effectiveDM = internalDisplayMode || yamlMode;
|
||||
// effect
|
||||
useEffect(() => {
|
||||
setInternalDisplayMode(displayMode);
|
||||
}, [displayMode]);
|
||||
useEffect(() => {
|
||||
if (yamlMode) {
|
||||
setInternalDisplayMode(true);
|
||||
}
|
||||
// children
|
||||
let childrenConditions: JSX.Element;
|
||||
if (effectiveDM) {
|
||||
const Viewer = getViewer(condition);
|
||||
childrenConditions = <Viewer condition={condition} onChange={onUpdate} namer={namer} />
|
||||
} else {
|
||||
const Editor = getEditor(condition);
|
||||
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
|
||||
}, [yamlMode]);
|
||||
// alias
|
||||
const onAddChild = () => {
|
||||
if (
|
||||
condition.condition === "and" ||
|
||||
condition.condition === "or" ||
|
||||
condition.condition === "not"
|
||||
) {
|
||||
onUpdate({
|
||||
...condition,
|
||||
conditions: condition.conditions.concat({
|
||||
condition: "or",
|
||||
conditions: [],
|
||||
}),
|
||||
});
|
||||
}
|
||||
// styles
|
||||
let hasChildren = false;
|
||||
if (condition.condition === "not") {
|
||||
hasChildren = true
|
||||
} else if (condition.condition === 'and') {
|
||||
hasChildren = true
|
||||
} else if (condition.condition === 'or') {
|
||||
hasChildren = true
|
||||
}
|
||||
const { classes } = useStyles({ hasChildren, isMobile });
|
||||
};
|
||||
// children
|
||||
let childrenConditions: JSX.Element;
|
||||
if (effectiveDM) {
|
||||
const Viewer = getViewer(condition);
|
||||
childrenConditions = (
|
||||
<Viewer condition={condition} onChange={onUpdate} namer={ha.namer} />
|
||||
);
|
||||
} else {
|
||||
const Editor = getEditor(condition);
|
||||
childrenConditions = (
|
||||
<Editor condition={condition} onChange={onUpdate} ha={ha} />
|
||||
);
|
||||
}
|
||||
// styles
|
||||
let hasChildren = false;
|
||||
if (condition.condition === "not") {
|
||||
hasChildren = true;
|
||||
} else if (condition.condition === "and") {
|
||||
hasChildren = true;
|
||||
} else if (condition.condition === "or") {
|
||||
hasChildren = true;
|
||||
}
|
||||
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>
|
||||
// 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}>
|
||||
return (
|
||||
<div className={classes.root}>
|
||||
<>
|
||||
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('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)}
|
||||
options={getSubTypeList("condition")}
|
||||
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>}
|
||||
{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)}
|
||||
/>}
|
||||
{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>}
|
||||
{!yamlMode && hasChildren && (
|
||||
<div className={classes.addBtnContainer}>
|
||||
<button className={classes.addBtn} onClick={() => onAddChild()}>
|
||||
Add
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{children({ classes })}
|
||||
</>
|
||||
</div>
|
||||
}
|
||||
);
|
||||
};
|
||||
@@ -1,6 +1,7 @@
|
||||
import { FC } from "react";
|
||||
import {
|
||||
AutomationCondition,
|
||||
DeviceCondition,
|
||||
LogicCondition,
|
||||
NumericCondition,
|
||||
StateCondition,
|
||||
@@ -16,11 +17,14 @@ import { ConditionNode } from "./ConditionNode";
|
||||
import { genUpdateMethods } from "./nestedUpdater";
|
||||
import { InputTime } from "components/Inputs/InputTime";
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
import { HAService } from "haService";
|
||||
import { DeviceEditor } from "components/DeviceEditor";
|
||||
|
||||
interface Editor<C extends AutomationCondition>
|
||||
extends FC<{
|
||||
condition: C;
|
||||
onChange: (condition: C) => void;
|
||||
ha: HAService;
|
||||
}> {}
|
||||
|
||||
export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
||||
@@ -33,6 +37,8 @@ export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
||||
return LogicViewer;
|
||||
case "not":
|
||||
return LogicViewer;
|
||||
case "device":
|
||||
return DeviceConditionEditor;
|
||||
case "numeric_state":
|
||||
return NumericStateEditor;
|
||||
case "state":
|
||||
@@ -68,6 +74,35 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
|
||||
);
|
||||
};
|
||||
|
||||
export const DeviceConditionEditor: Editor<DeviceCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
ha: {
|
||||
deviceExtras: { useDeviceConditionCapalities, useDeviceConditions },
|
||||
},
|
||||
}) => {
|
||||
return (
|
||||
<DeviceEditor
|
||||
type="condition"
|
||||
state={condition}
|
||||
setState={(data) =>
|
||||
onChange({
|
||||
condition: "device",
|
||||
...data,
|
||||
} as any)
|
||||
}
|
||||
options={useDeviceConditions(
|
||||
condition.device_id
|
||||
? {
|
||||
deviceId: condition.device_id,
|
||||
}
|
||||
: undefined
|
||||
)}
|
||||
caps={useDeviceConditionCapalities(condition as any)}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export const NumericStateEditor: Editor<NumericCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
|
||||
Reference in new issue
Block a user