- refactor for multi-config suport done
- added better errror captures
This commit is contained in:
1 parent
55ea1e23a4
commit
c67d1bd32f
32 files changed
+991
-835
No files matched your search
@@ -21,7 +21,7 @@ const Template: ComponentStory<typeof AutomationEditor> = (args) => {
|
||||
<AutomationEditor
|
||||
{...args}
|
||||
tagDB={useTagDB(
|
||||
state ? [{ id: state.metadata.id, tags: state.tags }] : [],
|
||||
state ? [{ id: state.id, tags: state.tags }] : [],
|
||||
() => {}
|
||||
)}
|
||||
automation={state}
|
||||
@@ -46,16 +46,13 @@ Simple.args = {
|
||||
Type: "Smell",
|
||||
Use: "Flushing",
|
||||
},
|
||||
metadata: {
|
||||
id:
|
||||
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
id: "random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
trigger: [
|
||||
{
|
||||
platform: "numeric_state",
|
||||
@@ -66,7 +63,7 @@ Simple.args = {
|
||||
event: "start",
|
||||
},
|
||||
],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
condition: "and",
|
||||
conditions: [
|
||||
@@ -102,17 +99,15 @@ EmptyStart.args = {
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
trigger: [],
|
||||
sequence: [],
|
||||
action: [],
|
||||
},
|
||||
};
|
||||
|
||||
@@ -122,10 +117,9 @@ BadAutomationInvalidMetadata.args = {
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {} as any,
|
||||
trigger: [],
|
||||
sequence: [],
|
||||
},
|
||||
action: [],
|
||||
} as any,
|
||||
};
|
||||
|
||||
export const BadAutomationInvalidTriggers = Template.bind({});
|
||||
@@ -134,17 +128,15 @@ BadAutomationInvalidTriggers.args = {
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
trigger: ["haha I am a string"] as any,
|
||||
sequence: [],
|
||||
action: [],
|
||||
},
|
||||
};
|
||||
|
||||
@@ -154,34 +146,29 @@ BadAutomationInvalidSequence.args = {
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Bad Choose Sequence",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
alias: "Bad Choose Sequence",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
trigger: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
choose: {},
|
||||
},
|
||||
] as any,
|
||||
},
|
||||
],
|
||||
} as any,
|
||||
};
|
||||
|
||||
export const RepeatExample = Template.bind({});
|
||||
RepeatExample.args = {
|
||||
...RepeatExample.args,
|
||||
automation: {
|
||||
metadata: {
|
||||
id: "1654976151462",
|
||||
alias: "Get out of baby room",
|
||||
description: "",
|
||||
mode: "single",
|
||||
},
|
||||
id: "1654976151462",
|
||||
alias: "Get out of baby room",
|
||||
description: "",
|
||||
mode: "single",
|
||||
trigger: [
|
||||
{
|
||||
type: "opened",
|
||||
@@ -192,7 +179,7 @@ RepeatExample.args = {
|
||||
},
|
||||
],
|
||||
condition: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
service: "notify.mobile_app_levas_phone",
|
||||
data: {
|
||||
|
||||
@@ -99,7 +99,7 @@ export const AutomationEditor: FC<Props> = ({
|
||||
)}
|
||||
<Modal open={infoBoxOpen}>
|
||||
<AutoInfoBox
|
||||
metadata={state.data.metadata}
|
||||
metadata={state.data}
|
||||
tags={state.data.tags}
|
||||
onUpdate={updateMetadata}
|
||||
tagDB={tagDB}
|
||||
@@ -128,14 +128,14 @@ export const AutomationEditor: FC<Props> = ({
|
||||
<div className="automation-editor--flow-wrapper--toolbar">
|
||||
<div className="automation-editor--flow-wrapper--toolbar--title">
|
||||
<span className="automation-editor--flow-wrapper--toolbar--title--text">
|
||||
<div className="id">{state.data.metadata.id}</div>
|
||||
<div className="id">{state.data.id}</div>
|
||||
<InputTextView
|
||||
value={state.data.metadata.alias ?? ""}
|
||||
value={state.data.alias ?? ""}
|
||||
placeholder="Name"
|
||||
onChange={(alias) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
...state.data,
|
||||
alias,
|
||||
},
|
||||
state.data.tags
|
||||
@@ -148,13 +148,13 @@ export const AutomationEditor: FC<Props> = ({
|
||||
label="Mode"
|
||||
className="automation-editor--flow-wrapper--toolbar--modes"
|
||||
current={{
|
||||
id: state.data.metadata.mode,
|
||||
id: state.data.mode,
|
||||
label: "",
|
||||
}}
|
||||
onChange={({ id }) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
...state.data,
|
||||
mode: id,
|
||||
},
|
||||
state.data.tags
|
||||
@@ -185,12 +185,12 @@ export const AutomationEditor: FC<Props> = ({
|
||||
/>
|
||||
<InputTextView
|
||||
className="description"
|
||||
value={state.data.metadata.description ?? ""}
|
||||
value={state.data.description ?? ""}
|
||||
placeholder="Description"
|
||||
onChange={(description) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
...state.data,
|
||||
description,
|
||||
},
|
||||
state.data.tags
|
||||
@@ -221,10 +221,10 @@ export const AutomationEditor: FC<Props> = ({
|
||||
</Button>
|
||||
</div>
|
||||
<DAGAutomationGraph
|
||||
sequence={state.data.sequence}
|
||||
action={state.data.action}
|
||||
trigger={state.data.trigger}
|
||||
condition={state.data.condition}
|
||||
onSequenceUpdate={updateSequence}
|
||||
onActionUpdate={updateSequence}
|
||||
onTriggerUpdate={updateTrigger}
|
||||
onConditionUpdate={updateCondition}
|
||||
isFlipped={flipped}
|
||||
@@ -277,26 +277,24 @@ export const ValidationBox: FC<{
|
||||
data: props.data,
|
||||
});
|
||||
|
||||
const makeSave =
|
||||
<K extends keyof EditorData>(k: K) =>
|
||||
(d: EditorData[K]) => {
|
||||
const newData = {
|
||||
...data,
|
||||
[k]: d,
|
||||
};
|
||||
const newFails = props.validate(newData);
|
||||
if (newFails) {
|
||||
setState({
|
||||
failures: newFails,
|
||||
data: newData,
|
||||
});
|
||||
} else {
|
||||
setState({
|
||||
failures: [],
|
||||
data: newData,
|
||||
});
|
||||
}
|
||||
const onSave = (d: EditorData) => {
|
||||
const newData = {
|
||||
...data,
|
||||
...d,
|
||||
};
|
||||
const newFails = props.validate(newData);
|
||||
if (newFails) {
|
||||
setState({
|
||||
failures: newFails,
|
||||
data: newData,
|
||||
});
|
||||
} else {
|
||||
setState({
|
||||
failures: [],
|
||||
data: newData,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="automation-editor-failures">
|
||||
@@ -317,27 +315,7 @@ export const ValidationBox: FC<{
|
||||
<span>
|
||||
Please correct the automation file manually and then continue!
|
||||
</span>
|
||||
<InputYaml
|
||||
label="Metadata"
|
||||
value={data.metadata}
|
||||
onChange={makeSave("metadata")}
|
||||
/>
|
||||
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
|
||||
<InputYaml
|
||||
label="Trigger"
|
||||
value={data.trigger}
|
||||
onChange={makeSave("trigger")}
|
||||
/>
|
||||
<InputYaml
|
||||
label="Condition"
|
||||
value={data.condition}
|
||||
onChange={makeSave("condition")}
|
||||
/>
|
||||
<InputYaml
|
||||
label="Actions"
|
||||
value={data.sequence}
|
||||
onChange={makeSave("sequence")}
|
||||
/>
|
||||
<InputYaml label="Raw" value={data} onChange={onSave} />
|
||||
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
|
||||
Save
|
||||
</Button>
|
||||
|
||||
@@ -90,7 +90,7 @@ export const useAutomatioEditorState = (
|
||||
return {
|
||||
validate: (data: any) => getFailures(data, v.AutomationData),
|
||||
updateTrigger: makeUpdate("trigger"),
|
||||
updateSequence: makeUpdate("sequence"),
|
||||
updateSequence: makeUpdate("action"),
|
||||
updateCondition: makeUpdate("condition"),
|
||||
saveAndUpdate,
|
||||
updateMetadata: (
|
||||
@@ -107,7 +107,7 @@ export const useAutomatioEditorState = (
|
||||
data: {
|
||||
...state.data,
|
||||
tags,
|
||||
metadata,
|
||||
...metadata,
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -140,16 +140,17 @@ export const useAutomatioEditorState = (
|
||||
};
|
||||
|
||||
const genEditorData = (automation: AutomationData) => {
|
||||
const { metadata, trigger, sequence, condition } = automation;
|
||||
const { tags: rawTags, trigger, action, condition, ...metadata } = automation;
|
||||
|
||||
const tags: [string, string][] = Object.keys(automation.tags).map(
|
||||
(tagName) => [tagName, automation.tags[tagName]]
|
||||
);
|
||||
const tags: [string, string][] = Object.keys(rawTags).map((tagName) => [
|
||||
tagName,
|
||||
rawTags[tagName],
|
||||
]);
|
||||
|
||||
return {
|
||||
metadata,
|
||||
...metadata,
|
||||
trigger,
|
||||
sequence,
|
||||
action,
|
||||
condition,
|
||||
tags,
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user