rebuilt condition editor
This commit is contained in:
1 parent
6da5a7592e
commit
cc2597c408
18 files changed
+599
-445
No files matched your search
@@ -1,52 +0,0 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { ConditionEditor } from ".";
|
||||
import { AutomationCondition } from 'types/automations/conditions';
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'ConditionEditor',
|
||||
component: ConditionEditor,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
} as ComponentMeta<typeof ConditionEditor>;
|
||||
|
||||
|
||||
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
|
||||
const [state, setState] = useState<AutomationCondition>({
|
||||
"condition": "or",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "numeric_state",
|
||||
"entity_id": [
|
||||
"sensor.kitchen_humidity"
|
||||
],
|
||||
"above": "40"
|
||||
},
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "states('switch.kitchen') == 'on'"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"condition": "numeric_state",
|
||||
"entity_id": [
|
||||
"sensor.kitchen_temperature"
|
||||
],
|
||||
"above": "51"
|
||||
}
|
||||
]
|
||||
})
|
||||
return (
|
||||
<Page>
|
||||
<ConditionEditor
|
||||
onUpdate={setState}
|
||||
onDelete={() => { }}
|
||||
condition={state}
|
||||
/>
|
||||
</Page>
|
||||
)
|
||||
}
|
||||
@@ -1,160 +0,0 @@
|
||||
import { Classes } from "jss";
|
||||
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 InputYaml from "components/Inputs/InputYaml";
|
||||
import { getEditor } from "./editorRender";
|
||||
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;
|
||||
onUpdate?: (data: AutomationCondition) => void;
|
||||
children?: (props: { classes: Classes<string> }) => JSX.Element;
|
||||
}> = ({
|
||||
condition,
|
||||
showDelete = false,
|
||||
displayMode = true,
|
||||
onDelete = () => {},
|
||||
onUpdate = () => {},
|
||||
children = () => {},
|
||||
}) => {
|
||||
// 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);
|
||||
}
|
||||
}, [yamlMode]);
|
||||
// alias
|
||||
const onAddChild = () => {
|
||||
if (
|
||||
condition.condition === "and" ||
|
||||
condition.condition === "or" ||
|
||||
condition.condition === "not"
|
||||
) {
|
||||
onUpdate({
|
||||
...condition,
|
||||
conditions: condition.conditions.concat({
|
||||
condition: "or",
|
||||
conditions: [],
|
||||
}),
|
||||
});
|
||||
}
|
||||
};
|
||||
// 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>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className={classes.root}>
|
||||
<>
|
||||
{showDelete && !effectiveDM && (
|
||||
<DeleteButton isRoot onClick={() => onDelete("root")} />
|
||||
)}
|
||||
<div className={classes.title}>
|
||||
<InputList
|
||||
label=""
|
||||
className={classes.titleText}
|
||||
current={condition.condition}
|
||||
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>
|
||||
)}
|
||||
</div>
|
||||
<div className={classes.children}>
|
||||
{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>
|
||||
)}
|
||||
</div>
|
||||
{children({ classes })}
|
||||
</>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,66 @@
|
||||
.condition-node-base {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
max-height: 85vh;
|
||||
}
|
||||
|
||||
.condition-node-base--list {
|
||||
max-width: 10em;
|
||||
width: 7em;
|
||||
}
|
||||
|
||||
.condition-node-base--body {
|
||||
flex: 1;
|
||||
min-height: 1.5em;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
|
||||
.condition-node-base--body--children.view {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
min-height: calc(100% - 1px);
|
||||
max-height: calc(100% - 1px);
|
||||
background-color: var(--secondary);
|
||||
border-color: var(--secondary-accent);
|
||||
border-bottom-style: solid;
|
||||
border-width: 1px;
|
||||
}
|
||||
|
||||
.condition-node-base--body .input-yaml {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.condition-node-base--body {
|
||||
overflow: auto;
|
||||
max-width: 100vw;
|
||||
}
|
||||
|
||||
.condition-node-base--body .condition-node-base--body--children {
|
||||
flex: 1;
|
||||
padding-left: 0.5em;
|
||||
max-width: 100vw;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
|
||||
.condition-node-base.is-edited>.condition-node-base--body {
|
||||
max-height: calc(100%-2px-1em);
|
||||
max-width: calc(100vw-2px-1em);
|
||||
border-color: var(--green);
|
||||
border-style: solid;
|
||||
border-width: 1px;
|
||||
margin: 0.25em;
|
||||
padding: 0.25em;
|
||||
}
|
||||
|
||||
.condition-node--logic-viewer--add {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding: 0.5em;
|
||||
background-color: var(--secondary);
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
.condition-node-base.mobile {
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.condition-node-base.mobile .condition-node-base--list {
|
||||
flex-direction: row;
|
||||
display: flex;
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
.condition-node-base.mobile .condition-node-base--body {
|
||||
min-height: 3em;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.condition-node-base.mobile .condition-node-base--body.edit {
|
||||
max-height: 500px;
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||
|
||||
export default {
|
||||
title: "ConditionEditor/NodeBase",
|
||||
component: ConditionNodeBase,
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
} as ComponentMeta<typeof ConditionNodeBase>;
|
||||
|
||||
const Template: ComponentStory<typeof ConditionNodeBase> = ({
|
||||
condition,
|
||||
...args
|
||||
}) => {
|
||||
const [data, setData] = useState(condition);
|
||||
return (
|
||||
<Page>
|
||||
<ConditionNodeBase
|
||||
{...args}
|
||||
condition={data}
|
||||
onUpdate={(data) => {
|
||||
setData(data);
|
||||
}}
|
||||
/>
|
||||
</Page>
|
||||
);
|
||||
};
|
||||
|
||||
export const TemplateViewer = Template.bind({});
|
||||
TemplateViewer.args = {
|
||||
condition: {
|
||||
condition: "template",
|
||||
value_template: "states('switch.light_kitchen') == 'on'",
|
||||
} as AutomationCondition,
|
||||
};
|
||||
|
||||
export const MultipleThings = Template.bind({});
|
||||
MultipleThings.args = {
|
||||
condition: {
|
||||
condition: "or",
|
||||
conditions: [
|
||||
{
|
||||
condition: "and",
|
||||
conditions: [
|
||||
{
|
||||
condition: "numeric_state",
|
||||
entity_id: ["sensor.kitchen_humidity"],
|
||||
above: "40",
|
||||
},
|
||||
{
|
||||
condition: "template",
|
||||
value_template: "states('switch.kitchen') == 'on'",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
condition: "numeric_state",
|
||||
entity_id: ["sensor.kitchen_temperature"],
|
||||
above: "51",
|
||||
},
|
||||
],
|
||||
} as AutomationCondition,
|
||||
};
|
||||
@@ -0,0 +1,130 @@
|
||||
import "./ConditionNodeBase.css";
|
||||
import "./ConditionNodeBase.mobile.css";
|
||||
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import { FC, useState } from "react";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { getSubTypeList } from "utils/automations";
|
||||
import { getConditionDefaultValues } from "utils/defaults";
|
||||
import CodeOutlinedIcon from "@mui/icons-material/CodeOutlined";
|
||||
import CodeOffOutlinedIcon from "@mui/icons-material/CodeOffOutlined";
|
||||
import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
|
||||
import SaveIcon from "@mui/icons-material/Save";
|
||||
import EditOffIcon from "@mui/icons-material/EditOff";
|
||||
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
|
||||
import SettingsApplicationsIcon from "@mui/icons-material/SettingsApplications";
|
||||
import { useHA } from "haService";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
import { getViewer } from "./viewRender";
|
||||
import { getEditor } from "./editorRender";
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
import { ConditionNodeSettings } from "./ConditionNodeSettings";
|
||||
|
||||
export type ConditionNodeBaseProps = {
|
||||
condition: AutomationCondition;
|
||||
onDelete?: () => void;
|
||||
onUpdate: (data: AutomationCondition) => void;
|
||||
disableDelete?: boolean;
|
||||
};
|
||||
export type ConditionNodeBaseViewMode = "edit" | "yaml" | "view";
|
||||
export const ConditionNodeBase: FC<ConditionNodeBaseProps> = (props) => {
|
||||
// state
|
||||
const ha = useHA();
|
||||
const { isMobile } = useWindowSize();
|
||||
const [{ isEdited, condition }, setCondition] = useState<{
|
||||
isEdited: boolean;
|
||||
condition: AutomationCondition;
|
||||
}>({
|
||||
isEdited: false,
|
||||
condition: props.condition,
|
||||
});
|
||||
const [mode, setMode] = useState<ConditionNodeBaseViewMode>("view");
|
||||
// alias
|
||||
const updateCondition = (data: any) =>
|
||||
setCondition({
|
||||
isEdited: true,
|
||||
condition: data,
|
||||
});
|
||||
|
||||
// children
|
||||
let childrenConditions: JSX.Element;
|
||||
if (mode === "view") {
|
||||
const Viewer = getViewer(condition);
|
||||
childrenConditions = (
|
||||
<Viewer
|
||||
condition={condition}
|
||||
onChange={props.onUpdate}
|
||||
namer={ha.namer}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
const Editor = getEditor(condition);
|
||||
childrenConditions = (
|
||||
<Editor condition={condition} onChange={updateCondition} ha={ha} />
|
||||
);
|
||||
}
|
||||
// icons
|
||||
const icons = (
|
||||
<ConditionNodeSettings
|
||||
onDelete={props.onDelete}
|
||||
onModeSwitch={setMode}
|
||||
onSave={() => {
|
||||
props.onUpdate(condition);
|
||||
setCondition({
|
||||
isEdited: false,
|
||||
condition,
|
||||
});
|
||||
}}
|
||||
mode={mode}
|
||||
isEdited={isEdited}
|
||||
disableDelete={props.disableDelete ?? false}
|
||||
/>
|
||||
);
|
||||
// render
|
||||
return (
|
||||
<div
|
||||
className={[
|
||||
"condition-node-base",
|
||||
isMobile ? "mobile" : "",
|
||||
isEdited ? "is-edited" : "",
|
||||
].join(" ")}
|
||||
>
|
||||
<div className="condition-node-base--list">
|
||||
<InputList
|
||||
label=""
|
||||
className="condition-node-base--list--select"
|
||||
current={condition.condition}
|
||||
options={getSubTypeList("condition")}
|
||||
onChange={(n: any) =>
|
||||
setCondition({
|
||||
isEdited: true,
|
||||
condition: {
|
||||
...getConditionDefaultValues(n),
|
||||
condition: n,
|
||||
},
|
||||
} as any)
|
||||
}
|
||||
/>
|
||||
{isMobile && icons}
|
||||
</div>
|
||||
<div className={["condition-node-base--body", mode].join(" ")}>
|
||||
{mode === "yaml" ? (
|
||||
<InputYaml
|
||||
key="yaml"
|
||||
label=""
|
||||
value={condition}
|
||||
onChange={updateCondition}
|
||||
/>
|
||||
) : (
|
||||
<div
|
||||
className={["condition-node-base--body--children", mode].join(" ")}
|
||||
>
|
||||
{childrenConditions}
|
||||
</div>
|
||||
)}
|
||||
{!isMobile && icons}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,18 @@
|
||||
.condition-node--settings--icons {
|
||||
display: inline-block;
|
||||
max-width: 5em;
|
||||
max-height: 5em;
|
||||
}
|
||||
|
||||
.condition-node--settings--wrap {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
min-width: 5em;
|
||||
min-height: 5em;
|
||||
}
|
||||
|
||||
.condition-node--settings button.Mui-disabled {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
.condition-node--settings.mobile {
|
||||
width: 3em;
|
||||
}
|
||||
|
||||
.condition-node--settings.mobile .speed-dial--button {
|
||||
max-width: 4em;
|
||||
max-height: 4em;
|
||||
height: 4em;
|
||||
width: 4em;
|
||||
}
|
||||
|
||||
.condition-node--settings.mobile .speed-dial--button:hover button {
|
||||
background-color: var(--secondary-accent);
|
||||
}
|
||||
|
||||
.condition-node--settings.mobile .speed-dial--list.open {
|
||||
top: 3.5em;
|
||||
/* left: 0.5em; */
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
import "./ConditionNodeSettings.css";
|
||||
import "./ConditionNodeSettings.mobile.css";
|
||||
|
||||
import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons";
|
||||
import CodeOutlinedIcon from "@mui/icons-material/CodeOutlined";
|
||||
import CodeOffOutlinedIcon from "@mui/icons-material/CodeOffOutlined";
|
||||
import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
|
||||
import SaveIcon from "@mui/icons-material/Save";
|
||||
import EditOffIcon from "@mui/icons-material/EditOff";
|
||||
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
|
||||
import SettingsApplicationsIcon from "@mui/icons-material/SettingsApplications";
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
import { FC } from "react";
|
||||
import { SpeedDial } from "components/SpeedDial";
|
||||
|
||||
export type ConditionNodeSettingsProps = {
|
||||
mode: ConditionNodeViewMode;
|
||||
onModeSwitch: (m: ConditionNodeViewMode) => void;
|
||||
isEdited: boolean;
|
||||
disableDelete: boolean;
|
||||
onDelete?: () => void;
|
||||
onSave: () => void;
|
||||
};
|
||||
export type ConditionNodeViewMode = "edit" | "yaml" | "view";
|
||||
export const ConditionNodeSettings: FC<ConditionNodeSettingsProps> = (
|
||||
props
|
||||
) => {
|
||||
// state
|
||||
const { isMobile } = useWindowSize();
|
||||
|
||||
// alias
|
||||
const showDelete = !props.disableDelete && !!props.onDelete;
|
||||
const createModeSwitch = (m: ConditionNodeViewMode) => () => {
|
||||
if (props.mode === m) {
|
||||
props.onModeSwitch("view");
|
||||
} else {
|
||||
props.onModeSwitch(m);
|
||||
}
|
||||
};
|
||||
const buttons: Array<ButtonIconProps> = [
|
||||
{
|
||||
color: "success",
|
||||
onClick: createModeSwitch("edit"),
|
||||
icon: props.mode === "edit" ? <EditOffIcon /> : <EditOutlinedIcon />,
|
||||
},
|
||||
{
|
||||
icon:
|
||||
props.mode === "yaml" ? <CodeOffOutlinedIcon /> : <CodeOutlinedIcon />,
|
||||
onClick: createModeSwitch("yaml"),
|
||||
color: "info",
|
||||
},
|
||||
{
|
||||
color: "success",
|
||||
icon: <SaveIcon />,
|
||||
disabled: !props.isEdited,
|
||||
onClick: props.onSave,
|
||||
},
|
||||
];
|
||||
if (showDelete) {
|
||||
buttons.push({
|
||||
color: "error",
|
||||
icon: <DeleteForeverIcon />,
|
||||
onClick: props.onDelete,
|
||||
});
|
||||
}
|
||||
// render
|
||||
if (isMobile) {
|
||||
return (
|
||||
<div
|
||||
className={[
|
||||
"condition-node--settings mobile",
|
||||
props.isEdited ? "edited" : "",
|
||||
].join(" ")}
|
||||
>
|
||||
<SpeedDial
|
||||
icon={
|
||||
<ButtonIcon
|
||||
icon={<SettingsApplicationsIcon />}
|
||||
color={props.isEdited ? "success" : "default"}
|
||||
/>
|
||||
}
|
||||
direction="column"
|
||||
>
|
||||
{buttons.map((opt, i) => (
|
||||
<ButtonIcon key={i} {...opt} />
|
||||
))}
|
||||
</SpeedDial>
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<div className="condition-node--settings--wrap">
|
||||
<div className="condition-node--settings--icons">
|
||||
{buttons.map((opt, i) => (
|
||||
<ButtonIcon key={i} {...opt} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
};
|
||||
@@ -13,12 +13,14 @@ import {
|
||||
import InputNumber from "components/Inputs/InputNumber";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import { InputEntity } from "components/Inputs/InputEntities";
|
||||
import { ConditionNode } from "./ConditionNode";
|
||||
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||
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";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import AddIcon from "@mui/icons-material/Add";
|
||||
|
||||
interface Editor<C extends AutomationCondition>
|
||||
extends FC<{
|
||||
@@ -171,15 +173,33 @@ export const LogicViewer: Editor<LogicCondition> = ({
|
||||
<>
|
||||
{condition.conditions.map((c, i) => {
|
||||
return (
|
||||
<ConditionNode
|
||||
<ConditionNodeBase
|
||||
key={i}
|
||||
condition={c}
|
||||
displayMode={false}
|
||||
{...genUpdateMethods(condition, onChange)(i)}
|
||||
showDelete
|
||||
disableDelete={false}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
<div className="condition-node--logic-viewer--add">
|
||||
<ButtonIcon
|
||||
icon={<AddIcon />}
|
||||
onClick={() =>
|
||||
onChange({
|
||||
condition: condition.condition,
|
||||
conditions: [
|
||||
...(condition.conditions ?? []),
|
||||
{
|
||||
condition: "device",
|
||||
device_id: "",
|
||||
domain: "",
|
||||
type: "",
|
||||
},
|
||||
],
|
||||
})
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -6,73 +6,114 @@ import { AutomationCondition } from "types/automations/conditions";
|
||||
import { ConditionEditor } from ".";
|
||||
|
||||
export default {
|
||||
title: 'ConditionEditor',
|
||||
title: "ConditionEditor",
|
||||
component: ConditionEditor,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
} as ComponentMeta<typeof ConditionEditor>;
|
||||
|
||||
|
||||
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
|
||||
|
||||
const Template: ComponentStory<typeof ConditionEditor> = ({
|
||||
condition,
|
||||
...args
|
||||
}) => {
|
||||
const [data, setData] = useState(condition);
|
||||
return <Page>
|
||||
<ConditionEditor {...args}
|
||||
condition={data}
|
||||
onUpdate={data => {
|
||||
setData(data)
|
||||
}}
|
||||
/>
|
||||
</Page>
|
||||
}
|
||||
return (
|
||||
<Page>
|
||||
<ConditionEditor
|
||||
{...args}
|
||||
condition={data}
|
||||
onUpdate={(data) => {
|
||||
setData(data);
|
||||
}}
|
||||
/>
|
||||
</Page>
|
||||
);
|
||||
};
|
||||
|
||||
export const TemplateViewer = Template.bind({})
|
||||
export const TemplateViewer = Template.bind({});
|
||||
TemplateViewer.args = {
|
||||
condition: {
|
||||
condition: 'template',
|
||||
value_template: "states('switch.light_kitchen') == 'on'"
|
||||
condition: "template",
|
||||
value_template: "states('switch.light_kitchen') == 'on'",
|
||||
} as AutomationCondition,
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
export const NumericStateViewer = Template.bind({})
|
||||
export const NumericStateViewer = Template.bind({});
|
||||
NumericStateViewer.args = {
|
||||
condition: {
|
||||
condition: "numeric_state",
|
||||
entity_id: "sensor.humidity_kitchen",
|
||||
above: "10",
|
||||
} as AutomationCondition,
|
||||
}
|
||||
};
|
||||
|
||||
export const LogicCondition = Template.bind({})
|
||||
export const LogicCondition = Template.bind({});
|
||||
LogicCondition.args = {
|
||||
condition: {
|
||||
condition: 'or',
|
||||
condition: "or",
|
||||
conditions: [
|
||||
{
|
||||
condition: 'numeric_state',
|
||||
entity_id: 'sensor.humidity_kitchen',
|
||||
above: '60'
|
||||
condition: "numeric_state",
|
||||
entity_id: "sensor.humidity_kitchen",
|
||||
above: "60",
|
||||
},
|
||||
{
|
||||
condition: 'numeric_state',
|
||||
entity_id: 'sensor.humidity_living_room',
|
||||
above: '60'
|
||||
condition: "numeric_state",
|
||||
entity_id: "sensor.humidity_living_room",
|
||||
above: "60",
|
||||
},
|
||||
{
|
||||
condition: 'and',
|
||||
condition: "and",
|
||||
conditions: [
|
||||
{
|
||||
condition: 'numeric_state',
|
||||
entity_id: 'sensor.humidity_bedroom',
|
||||
above: '60'
|
||||
condition: "numeric_state",
|
||||
entity_id: "sensor.humidity_bedroom",
|
||||
above: "60",
|
||||
},
|
||||
{
|
||||
condition: 'numeric_state',
|
||||
entity_id: 'sensor.humidity_bathroom',
|
||||
above: '60'
|
||||
}
|
||||
]
|
||||
condition: "numeric_state",
|
||||
entity_id: "sensor.humidity_bathroom",
|
||||
above: "60",
|
||||
},
|
||||
],
|
||||
},
|
||||
]
|
||||
],
|
||||
} as AutomationCondition,
|
||||
}
|
||||
};
|
||||
|
||||
export const MultipleConditions: ComponentStory<typeof ConditionEditor> = (
|
||||
args
|
||||
) => {
|
||||
const [state, setState] = useState<AutomationCondition>({
|
||||
condition: "or",
|
||||
conditions: [
|
||||
{
|
||||
condition: "and",
|
||||
conditions: [
|
||||
{
|
||||
condition: "numeric_state",
|
||||
entity_id: ["sensor.kitchen_humidity"],
|
||||
above: "40",
|
||||
},
|
||||
{
|
||||
condition: "template",
|
||||
value_template: "states('switch.kitchen') == 'on'",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
condition: "numeric_state",
|
||||
entity_id: ["sensor.kitchen_temperature"],
|
||||
above: "51",
|
||||
},
|
||||
],
|
||||
});
|
||||
return (
|
||||
<Page>
|
||||
<ConditionEditor
|
||||
onUpdate={setState}
|
||||
onDelete={() => {}}
|
||||
condition={state}
|
||||
/>
|
||||
</Page>
|
||||
);
|
||||
};
|
||||
@@ -1,27 +1,21 @@
|
||||
import { FC } from "react";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { ConditionNode } from "./ConditionNode";
|
||||
|
||||
|
||||
|
||||
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||
|
||||
export const ConditionEditor: FC<{
|
||||
condition: AutomationCondition;
|
||||
onDelete: (which: 'root' | number) => void;
|
||||
onDelete: () => void;
|
||||
onUpdate: (data: AutomationCondition) => void;
|
||||
}> = ({
|
||||
condition,
|
||||
onDelete,
|
||||
onUpdate,
|
||||
}) => {
|
||||
// state
|
||||
return <ConditionNode
|
||||
}> = ({ condition, onDelete, onUpdate }) => {
|
||||
// state
|
||||
return (
|
||||
<ConditionNodeBase
|
||||
condition={condition}
|
||||
onDelete={onDelete}
|
||||
onUpdate={update => {
|
||||
onUpdate(update)
|
||||
onUpdate={(update) => {
|
||||
onUpdate(update);
|
||||
}}
|
||||
displayMode
|
||||
showDelete={false}
|
||||
disableDelete={true}
|
||||
/>
|
||||
}
|
||||
);
|
||||
};
|
||||
@@ -1,28 +1,26 @@
|
||||
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
|
||||
import {
|
||||
AutomationCondition,
|
||||
LogicCondition,
|
||||
} from "types/automations/conditions";
|
||||
|
||||
|
||||
export const genUpdateMethods = (
|
||||
condition: LogicCondition,
|
||||
onChange: (c: LogicCondition) => void
|
||||
) => (i: number) => ({
|
||||
onUpdate: (update: AutomationCondition) => onChange({
|
||||
export const genUpdateMethods =
|
||||
(condition: LogicCondition, onChange: (c: LogicCondition) => void) =>
|
||||
(i: number) => ({
|
||||
onUpdate: (update: AutomationCondition) =>
|
||||
onChange({
|
||||
...condition,
|
||||
conditions: [
|
||||
...condition.conditions.slice(0, i),
|
||||
update,
|
||||
...condition.conditions.slice(i + 1)
|
||||
]
|
||||
}),
|
||||
onDelete: (which: 'root' | number) => {
|
||||
if (which === 'root') {
|
||||
onChange({
|
||||
...condition,
|
||||
conditions: condition.conditions.slice(0, i).concat(
|
||||
condition.conditions.slice(i + 1)
|
||||
)
|
||||
})
|
||||
} else {
|
||||
throw new Error("Not Implemented")
|
||||
}
|
||||
}
|
||||
})
|
||||
...condition.conditions.slice(0, i),
|
||||
update,
|
||||
...condition.conditions.slice(i + 1),
|
||||
],
|
||||
}),
|
||||
onDelete: () => {
|
||||
onChange({
|
||||
...condition,
|
||||
conditions: condition.conditions
|
||||
.slice(0, i)
|
||||
.concat(condition.conditions.slice(i + 1)),
|
||||
});
|
||||
},
|
||||
});
|
||||
@@ -1,142 +0,0 @@
|
||||
import { Styles } from "jss";
|
||||
import { createAppUseStyles } from "styles/theme";
|
||||
|
||||
export const useStyles = createAppUseStyles<{
|
||||
hasChildren: boolean,
|
||||
isMobile: boolean,
|
||||
}>(theme => {
|
||||
const deleteBtn: Styles = {
|
||||
borderRadius: '10px',
|
||||
borderStyle: 'none',
|
||||
padding: '0',
|
||||
margin: '0',
|
||||
background: theme.red,
|
||||
width: '30px',
|
||||
height: '15px',
|
||||
fontSize: '10px',
|
||||
textAlign: 'center',
|
||||
cursor: 'pointer',
|
||||
"&:hover": {
|
||||
background: theme.redAccent,
|
||||
}
|
||||
}
|
||||
return {
|
||||
root: ({ hasChildren, isMobile }) => ({
|
||||
background: theme.primary,
|
||||
padding: 0,
|
||||
position: 'relative',
|
||||
display: 'flex',
|
||||
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
|
||||
}),
|
||||
title: ({ hasChildren }) => ({
|
||||
display: 'flex',
|
||||
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
|
||||
borderRadius: 10,
|
||||
borderBottomRightRadius: 0,
|
||||
borderBottomLeftRadius: 0,
|
||||
height: '100%',
|
||||
}),
|
||||
titleText: ({ hasChildren }) => ({
|
||||
background: theme.condition.primaryColor,
|
||||
border: `1px solid ${theme.primaryAccent}`,
|
||||
borderRadius: 10,
|
||||
borderTopRightRadius: 0,
|
||||
borderBottomRightRadius: 0,
|
||||
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
||||
minWidth: '10em',
|
||||
maxWidth: '30em',
|
||||
textOverflow: 'ellipsis',
|
||||
textAlign: 'center',
|
||||
cursor: 'pointer',
|
||||
color: theme.primaryAccent,
|
||||
}),
|
||||
deleteBtnRoot: {
|
||||
...deleteBtn,
|
||||
position: 'absolute',
|
||||
left: -35,
|
||||
top: 10,
|
||||
},
|
||||
modifyBtn: ({ hasChildren }) => ({
|
||||
// styling
|
||||
backgroundColor: theme.green,
|
||||
color: theme.primary,
|
||||
fill: theme.primaryAccent,
|
||||
borderColor: theme.primaryAccent,
|
||||
borderWidth: 1,
|
||||
borderRadius: hasChildren ? 10 : 0,
|
||||
borderTopLeftRadius: 0,
|
||||
borderBottomLeftRadius: 0,
|
||||
cursor: 'pointer',
|
||||
|
||||
// positioning
|
||||
display: 'flex',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
padding: '0px 10px',
|
||||
right: 1,
|
||||
top: 10,
|
||||
|
||||
// on hover
|
||||
"&:hover": {
|
||||
backgroundColor: theme.greenLight,
|
||||
fill: theme.primaryAccentLight,
|
||||
},
|
||||
"&:hover $icon": {
|
||||
transform: "rotate(90deg)"
|
||||
}
|
||||
}),
|
||||
icon: {},
|
||||
deleteBtn,
|
||||
conditionWrap: {
|
||||
overflow: 'auto',
|
||||
},
|
||||
children: ({ hasChildren }) => ({
|
||||
flex: 1,
|
||||
paddingLeft: hasChildren ? 50 : 10,
|
||||
paddingRight: hasChildren ? 0 : 10,
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
justifyContent: 'center',
|
||||
border: `1px solid ${theme.secondaryAccent}`,
|
||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
||||
minHeight: hasChildren ? undefined : '100%',
|
||||
overflow: 'scroll'
|
||||
}),
|
||||
addBtnContainer: {
|
||||
display: 'flex',
|
||||
justifyContent: 'center',
|
||||
},
|
||||
yamlBtn: {
|
||||
backgroundColor: theme.secondary,
|
||||
borderWidth: 1,
|
||||
borderStyle: 'solid',
|
||||
borderColor: theme.secondaryAccent,
|
||||
color: theme.secondaryAccent,
|
||||
paddingLeft: 20,
|
||||
paddingRight: 20,
|
||||
cursor: 'pointer',
|
||||
"&:hover": {
|
||||
backgroundColor: theme.primaryLight,
|
||||
fill: theme.primaryAccentLight,
|
||||
},
|
||||
},
|
||||
addBtn: {
|
||||
backgroundColor: theme.secondary,
|
||||
borderWidth: 1,
|
||||
borderStyle: 'solid',
|
||||
borderColor: theme.secondaryAccent,
|
||||
color: theme.secondaryAccent,
|
||||
borderRadius: 5,
|
||||
marginTop: 5,
|
||||
marginBottom: 5,
|
||||
paddingLeft: 20,
|
||||
paddingRight: 20,
|
||||
cursor: 'pointer',
|
||||
"&:hover": {
|
||||
backgroundColor: theme.primaryLight,
|
||||
fill: theme.primaryAccentLight,
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
LogicCondition,
|
||||
} from "types/automations/conditions";
|
||||
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
|
||||
import { ConditionNode } from "./ConditionNode";
|
||||
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||
import { genUpdateMethods } from "./nestedUpdater";
|
||||
|
||||
interface Viewer<C extends AutomationCondition>
|
||||
@@ -40,10 +40,10 @@ export const LogicViewer: Viewer<LogicCondition> = ({
|
||||
<>
|
||||
{condition.conditions.map((c, i) => {
|
||||
return (
|
||||
<ConditionNode
|
||||
<ConditionNodeBase
|
||||
key={i}
|
||||
condition={c}
|
||||
displayMode
|
||||
// displayMode
|
||||
{...genUpdateMethods(condition, onChange)(i)}
|
||||
/>
|
||||
);
|
||||
|
||||
@@ -2,14 +2,15 @@ import "./ButtonIcons.css";
|
||||
import { FC, ReactNode } from "react";
|
||||
import MuiIconButton, { IconButtonTypeMap } from "@mui/material/IconButton";
|
||||
|
||||
export const ButtonIcon: FC<{
|
||||
export type ButtonIconProps = {
|
||||
icon: ReactNode;
|
||||
onClick?: () => void;
|
||||
className?: string;
|
||||
title?: string;
|
||||
disabled?: boolean;
|
||||
color?: IconButtonTypeMap["props"]["color"];
|
||||
}> = (props) => {
|
||||
};
|
||||
export const ButtonIcon: FC<ButtonIconProps> = (props) => {
|
||||
return (
|
||||
<MuiIconButton
|
||||
className={["icon-button", props.className ?? ""].join(" ")}
|
||||
|
||||
@@ -65,6 +65,30 @@ export const InternalPage: FC<{
|
||||
background: theme.palette.background.default,
|
||||
}}
|
||||
>
|
||||
{/* <style>
|
||||
{`:root {
|
||||
--primary: ${theme.palette.primary.main};
|
||||
--secondary: ${theme.palette.secondary.main};
|
||||
--secondary: ${theme.palette..main};
|
||||
--primary-accent: #bbb;
|
||||
--primary-accent-light: #eee;
|
||||
--secondary-accent: #929191;
|
||||
--green: #1f1;
|
||||
--green-opaque: #1f15;
|
||||
--green-light: #6f5;
|
||||
--error: #c55;
|
||||
--error-light: #f77;
|
||||
--error-dark: #5c2323;
|
||||
--error-opaque: #c555;
|
||||
--error-accent: #9f3a3a;
|
||||
--change: #0f9;
|
||||
--condition-primary: #447;
|
||||
--condition-accent: #8af;
|
||||
--condition-primary-opaque: #4476;
|
||||
touch-action: pan-x pan-y;
|
||||
height: 100%;
|
||||
}`}
|
||||
</style> */}
|
||||
<VersionBox />
|
||||
{children}
|
||||
</main>
|
||||
|
||||
@@ -24,9 +24,21 @@
|
||||
bottom: -3em;
|
||||
left: 0em;
|
||||
background: var(--secondary);
|
||||
z-index: 10;
|
||||
height: fit-content;
|
||||
padding: 0.1em;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.speed-dial--list.open.row {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.speed-dial--list.open.column {
|
||||
display: flex;
|
||||
top: 2em;
|
||||
flex-direction: column;
|
||||
gap: 0.25em;
|
||||
left: 0.25em;
|
||||
}
|
||||
Reference in new issue
Block a user