added defaults
This commit is contained in:
1 parent
25f21fcc93
commit
eb12ecc5d6
7 files changed
+121
-22
No files matched your search
@@ -0,0 +1,41 @@
|
|||||||
|
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from "./types/conditions";
|
||||||
|
|
||||||
|
|
||||||
|
export const getConditionDefaultValues = (condition: AutomationCondition['condition']): AutomationCondition['condition_data'] => {
|
||||||
|
if (
|
||||||
|
(condition === 'or') ||
|
||||||
|
(condition === 'and') ||
|
||||||
|
(condition === 'not')
|
||||||
|
) {
|
||||||
|
return {
|
||||||
|
conditions: []
|
||||||
|
} as LogicCondition['condition_data']
|
||||||
|
} else if (condition === 'template') {
|
||||||
|
return {
|
||||||
|
value_template: ""
|
||||||
|
} as TemplateCondition['condition_data']
|
||||||
|
} else if (condition === 'numeric_state') {
|
||||||
|
return {
|
||||||
|
entity_id: []
|
||||||
|
} as NumericCondition['condition_data']
|
||||||
|
} else if (condition === 'state') {
|
||||||
|
return {
|
||||||
|
entity_id: [],
|
||||||
|
state: [],
|
||||||
|
} as StateCondition['condition_data']
|
||||||
|
} else if (condition === 'time') {
|
||||||
|
return {
|
||||||
|
} as TimeCondition['condition_data']
|
||||||
|
} else if (condition === 'trigger') {
|
||||||
|
return {
|
||||||
|
id: []
|
||||||
|
} as TriggerCondition['condition_data']
|
||||||
|
} else if (condition === 'zone') {
|
||||||
|
return {
|
||||||
|
zone: "",
|
||||||
|
entity_id: [],
|
||||||
|
state: [],
|
||||||
|
} as ZoneCondition['condition_data']
|
||||||
|
}
|
||||||
|
throw new Error("NOT IMPLEMENTED!")
|
||||||
|
}
|
||||||
@@ -48,13 +48,3 @@ export type AutomationCondition =
|
|||||||
| TriggerCondition
|
| TriggerCondition
|
||||||
| ZoneCondition
|
| ZoneCondition
|
||||||
;
|
;
|
||||||
export const conditionTypes = [
|
|
||||||
'Logic',
|
|
||||||
'Numeric State',
|
|
||||||
'State',
|
|
||||||
'Template',
|
|
||||||
'Time',
|
|
||||||
'Trigger',
|
|
||||||
'Zone',
|
|
||||||
] as const;
|
|
||||||
export type ConditionType = typeof conditionTypes[number];
|
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
import { Classes } from "jss";
|
import { Classes } from "jss";
|
||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
|
import { getConditionDefaultValues } from "~/automations/defaults";
|
||||||
import { AutomationCondition } from "~/automations/types/conditions";
|
import { AutomationCondition } from "~/automations/types/conditions";
|
||||||
import { CheckMarkIcon, PencilIcon } from "~/icons/icons";
|
import { CheckMarkIcon, PencilIcon } from "~/icons/icons";
|
||||||
|
import InputList from "../Inputs/InputList";
|
||||||
import { getEditor } from "./editorRender";
|
import { getEditor } from "./editorRender";
|
||||||
import { useStyles } from "./style";
|
import { useStyles } from "./style";
|
||||||
import { getViewer } from "./viewRender";
|
import { getViewer } from "./viewRender";
|
||||||
@@ -13,7 +15,6 @@ export const ConditionNode: FC<{
|
|||||||
displayMode: boolean;
|
displayMode: boolean;
|
||||||
showDelete?: boolean;
|
showDelete?: boolean;
|
||||||
onDelete?: (which: 'root' | number) => void;
|
onDelete?: (which: 'root' | number) => void;
|
||||||
onAddChild?: () => void;
|
|
||||||
onUpdate?: (data: AutomationCondition) => void;
|
onUpdate?: (data: AutomationCondition) => void;
|
||||||
children?: (props: {
|
children?: (props: {
|
||||||
classes: Classes<string>
|
classes: Classes<string>
|
||||||
@@ -24,14 +25,33 @@ export const ConditionNode: FC<{
|
|||||||
onDelete=() => {},
|
onDelete=() => {},
|
||||||
onUpdate=() => {},
|
onUpdate=() => {},
|
||||||
displayMode=() => {},
|
displayMode=() => {},
|
||||||
onAddChild=() => {},
|
|
||||||
children=() => {},
|
children=() => {},
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [internalDisplayMode, setInternalDisplayMode] = useState(true);
|
const [internalDisplayMode, setInternalDisplayMode] = useState(true);
|
||||||
// alias
|
// alias
|
||||||
const effectiveDM = displayMode && internalDisplayMode;
|
const effectiveDM = displayMode && internalDisplayMode;
|
||||||
console.log({effectiveDM})
|
const onAddChild = () => {
|
||||||
|
if(
|
||||||
|
(condition.condition === 'and') ||
|
||||||
|
(condition.condition === 'or') ||
|
||||||
|
(condition.condition === 'not')
|
||||||
|
) {
|
||||||
|
onUpdate({
|
||||||
|
...condition,
|
||||||
|
condition_data: {
|
||||||
|
...condition.condition_data,
|
||||||
|
conditions: condition.condition_data.conditions.concat({
|
||||||
|
$smType: 'condition',
|
||||||
|
condition: 'or',
|
||||||
|
condition_data: {
|
||||||
|
conditions: []
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
// children
|
// children
|
||||||
let childrenConditions: JSX.Element;
|
let childrenConditions: JSX.Element;
|
||||||
if (effectiveDM) {
|
if (effectiveDM) {
|
||||||
@@ -54,6 +74,7 @@ export const ConditionNode: FC<{
|
|||||||
} else if (condition.condition ==='or') {
|
} else if (condition.condition ==='or') {
|
||||||
hasChildren = true
|
hasChildren = true
|
||||||
}
|
}
|
||||||
|
console.log({condition: condition.condition, hasChildren})
|
||||||
const {classes} = useStyles({ hasChildren });
|
const {classes} = useStyles({ hasChildren });
|
||||||
|
|
||||||
// components
|
// components
|
||||||
@@ -63,13 +84,36 @@ export const ConditionNode: FC<{
|
|||||||
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}>
|
<div className={classes.title}>
|
||||||
<span className={classes.titleText}>{condition.condition.replace('_', ' ')}</span>
|
{/* <span className={classes.titleText}>{condition.condition.replace('_', ' ')}</span> */}
|
||||||
|
<InputList
|
||||||
|
className={classes.titleText}
|
||||||
|
current={condition.condition}
|
||||||
|
options={[
|
||||||
|
'or', 'not', 'and',
|
||||||
|
'template',
|
||||||
|
'numeric_state',
|
||||||
|
'state',
|
||||||
|
'time',
|
||||||
|
'trigger',
|
||||||
|
'zone',
|
||||||
|
]}
|
||||||
|
onChange={n => onUpdate({
|
||||||
|
condition: n,
|
||||||
|
condition_data: {
|
||||||
|
...getConditionDefaultValues(n),
|
||||||
|
...condition.condition_data,
|
||||||
|
}
|
||||||
|
} as any)}
|
||||||
|
/>
|
||||||
<button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
<button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
||||||
{effectiveDM ? <PencilIcon className={classes.icon}/> : <CheckMarkIcon className={classes.icon}/>}
|
{effectiveDM ? <PencilIcon className={classes.icon}/> : <CheckMarkIcon className={classes.icon}/>}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className={classes.children}>
|
<div className={classes.children}>
|
||||||
{childrenConditions}
|
{childrenConditions}
|
||||||
|
{hasChildren && <div className={classes.addBtnContainer}>
|
||||||
|
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
||||||
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
{children({classes})}
|
{children({classes})}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -15,9 +15,12 @@ const Template: ComponentStory<typeof ConditionEditor> = ({condition, ...args})
|
|||||||
const {classes} = usePageTheme({});
|
const {classes} = usePageTheme({});
|
||||||
const [data, setData] = useState(condition);
|
const [data, setData] = useState(condition);
|
||||||
return <div className={classes.page}>
|
return <div className={classes.page}>
|
||||||
<ConditionEditor {...args} condition={data} onUpdate={data => {
|
<ConditionEditor {...args}
|
||||||
|
condition={data}
|
||||||
|
onUpdate={data => {
|
||||||
setData(data)
|
setData(data)
|
||||||
}} />
|
}}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,13 +8,11 @@ import { ConditionNode } from "./ConditionNode";
|
|||||||
export const ConditionEditor: FC<{
|
export const ConditionEditor: FC<{
|
||||||
condition: AutomationCondition;
|
condition: AutomationCondition;
|
||||||
onDelete: (which: 'root' | number) => void;
|
onDelete: (which: 'root' | number) => void;
|
||||||
onAddChild: () => void;
|
|
||||||
onUpdate: (data: AutomationCondition) => void;
|
onUpdate: (data: AutomationCondition) => void;
|
||||||
}> = ({
|
}> = ({
|
||||||
condition,
|
condition,
|
||||||
onDelete,
|
onDelete,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
onAddChild,
|
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
return <ConditionNode
|
return <ConditionNode
|
||||||
@@ -23,7 +21,6 @@ export const ConditionEditor: FC<{
|
|||||||
onUpdate={update => {
|
onUpdate={update => {
|
||||||
onUpdate(update)
|
onUpdate(update)
|
||||||
}}
|
}}
|
||||||
onAddChild={onAddChild}
|
|
||||||
displayMode
|
displayMode
|
||||||
showDelete
|
showDelete
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -45,10 +45,12 @@ export const useStyles = createAppUseStyles<{
|
|||||||
borderBottomRightRadius: 0,
|
borderBottomRightRadius: 0,
|
||||||
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
maxWidth: 80,
|
maxWidth: 120,
|
||||||
minWidth: 30,
|
minWidth: 30,
|
||||||
textOverflow: 'ellipsis',
|
textOverflow: 'ellipsis',
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
|
cursor: 'pointer',
|
||||||
|
color: theme.primaryAccent,
|
||||||
}),
|
}),
|
||||||
deleteBtnRoot: {
|
deleteBtnRoot: {
|
||||||
...deleteBtn,
|
...deleteBtn,
|
||||||
@@ -99,6 +101,28 @@ export const useStyles = createAppUseStyles<{
|
|||||||
border: `1px solid ${theme.primaryAccent}`,
|
border: `1px solid ${theme.primaryAccent}`,
|
||||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
borderBottomRightRadius: hasChildren ? 10 : 0,
|
||||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
||||||
})
|
}),
|
||||||
|
addBtnContainer: {
|
||||||
|
display: 'flex',
|
||||||
|
justifyContent: 'center',
|
||||||
|
},
|
||||||
|
addBtn: {
|
||||||
|
backgroundColor: theme.secondary,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderStyle: 'solid',
|
||||||
|
borderColor: theme.secondaryAccent,
|
||||||
|
color: theme.secondaryAccent,
|
||||||
|
borderRadius: 5,
|
||||||
|
marginTop: 5,
|
||||||
|
marginBottom: 5,
|
||||||
|
marginRight: 5,
|
||||||
|
paddingLeft: 20,
|
||||||
|
paddingRight: 20,
|
||||||
|
cursor: 'pointer',
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: Color(theme.primary).brighten().hex(),
|
||||||
|
fill: Color(theme.primaryAccent).brighten().hex(),
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -17,7 +17,7 @@ export const {
|
|||||||
primaryColor: '#4f4f77',
|
primaryColor: '#4f4f77',
|
||||||
},
|
},
|
||||||
red: '#ed0c0c',
|
red: '#ed0c0c',
|
||||||
redAccent: '#9f3a3a'
|
redAccent: '#9f3a3a',
|
||||||
}));
|
}));
|
||||||
|
|
||||||
export type GetThemeType<C extends Context<any>> = C extends Context<infer T> ? T : unknown;
|
export type GetThemeType<C extends Context<any>> = C extends Context<infer T> ? T : unknown;
|
||||||
|
|||||||
Reference in new issue
Block a user