Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b21734041 | ||
|
|
754cc2ef98 | ||
|
|
1cb40288b1 | ||
|
|
129ba28ff5 | ||
|
|
44e246f79b |
No files matched your search
@@ -1,5 +1,10 @@
|
||||
# Changelog 
|
||||
|
||||
## [0.5.3] - Bug Fixes
|
||||
|
||||
- Redirecting `/` to `/web` to resolve container install strangeness reported in https://github.com/asosnovsky/Shortumation/issues/125
|
||||
- Fixed missing flag that caused the automation to explode in https://github.com/asosnovsky/Shortumation/issues/124
|
||||
|
||||
## [0.5.2] - Better Controls
|
||||
|
||||
- Add automation trigger
|
||||
|
||||
@@ -52,10 +52,10 @@ It should now appear in your `Add-on Store` and you should be able to install it
|
||||
|
||||
### Containerized or HA Core
|
||||
|
||||
Please note that this way of using Shortumation is **not future proof**.
|
||||
|
||||
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml), or read the [extended guide here](https://github.com/asosnovsky/Shortumation/wiki/Installation#containerized--ha-core).
|
||||
|
||||
In general, if you want to help provide this to more home-assistant fans please join on the conversation here https://github.com/asosnovsky/Shortumation/issues/102 or help contribute :)
|
||||
|
||||
## FAQ
|
||||
|
||||
**How is this different from Node-Red?**
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
name: Shortumation
|
||||
version: v0.5.2
|
||||
version: v0.5.3
|
||||
slug: shortumation
|
||||
image: asosnovsky/shortumation-{arch}
|
||||
url: "https://github.com/asosnovsky/Shortumation"
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import InputText from "components/Inputs/Base/InputText";
|
||||
import { SceneAction } from "types/automations/actions";
|
||||
import { OptionManager } from "./OptionManager";
|
||||
|
||||
export const ActionSceneState: OptionManager<SceneAction> = {
|
||||
defaultState: () => ({
|
||||
scene: "",
|
||||
}),
|
||||
isReady: () => true,
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputText
|
||||
label="Scene"
|
||||
value={state.scene ?? ""}
|
||||
onChange={(d) => setState({ ...state, scene: d })}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,39 @@
|
||||
import { OptionManager } from "./OptionManager";
|
||||
import { AutomationTriggerCalendar } from "types/automations/triggers";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import InputText from "components/Inputs/Base/InputText";
|
||||
|
||||
export const TriggerCalendarState: OptionManager<AutomationTriggerCalendar> = {
|
||||
defaultState: (): AutomationTriggerCalendar => ({
|
||||
platform: "calendar",
|
||||
event: "sunset",
|
||||
}),
|
||||
isReady: () => true,
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputList
|
||||
label="Event Type"
|
||||
current={state.event}
|
||||
options={["start", "end"]}
|
||||
onChange={(event) =>
|
||||
setState({
|
||||
...state,
|
||||
event,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<InputText
|
||||
label="Offset"
|
||||
value={state.offset ?? ""}
|
||||
onChange={(s) =>
|
||||
setState({
|
||||
...state,
|
||||
offset: !s ? undefined : s,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,39 @@
|
||||
import { OptionManager } from "./OptionManager";
|
||||
import { AutomationTriggerSun } from "types/automations/triggers";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import InputText from "components/Inputs/Base/InputText";
|
||||
|
||||
export const TriggerSunState: OptionManager<AutomationTriggerSun> = {
|
||||
defaultState: (): AutomationTriggerSun => ({
|
||||
platform: "sun",
|
||||
event: "sunset",
|
||||
}),
|
||||
isReady: () => true,
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputList
|
||||
label="Event Type"
|
||||
current={state.event}
|
||||
options={["sunset", "sunrise"]}
|
||||
onChange={(event) =>
|
||||
setState({
|
||||
...state,
|
||||
event,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<InputText
|
||||
label="Offset"
|
||||
value={state.offset ?? ""}
|
||||
onChange={(s) =>
|
||||
setState({
|
||||
...state,
|
||||
offset: !s ? undefined : s,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
},
|
||||
};
|
||||
@@ -8,7 +8,7 @@ export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
|
||||
webhook_id: "",
|
||||
}),
|
||||
isReady: () => true,
|
||||
renderOptionList: (state, setState) => {
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputText
|
||||
@@ -21,6 +21,10 @@ export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
|
||||
})
|
||||
}
|
||||
/>
|
||||
<span>
|
||||
You can run this automation by sending an HTTP POST request to
|
||||
http://your-home-assistant-ip/api/webhook/{state.webhook_id}.
|
||||
</span>
|
||||
</>
|
||||
);
|
||||
},
|
||||
|
||||
@@ -20,6 +20,9 @@ import { TriggerZone } from "./TriggerZone";
|
||||
import { TriggerDevice } from "./TriggerDevice";
|
||||
import { ActionStopState } from "./ActionStop";
|
||||
import { ActionParallelState } from "./ActionParallel";
|
||||
import { TriggerSunState } from "./TriggerSun";
|
||||
import { TriggerCalendarState } from "./TriggerCalendar";
|
||||
import { ActionSceneState } from "./ActionScene";
|
||||
|
||||
export const getOptionManager = <T extends AutomationNodeTypes>(
|
||||
nodeType: T,
|
||||
@@ -39,6 +42,8 @@ export const getOptionManager = <T extends AutomationNodeTypes>(
|
||||
return ActionCallServiceState;
|
||||
case "wait":
|
||||
return ActionWaitState;
|
||||
case "scene":
|
||||
return ActionSceneState;
|
||||
case "stop":
|
||||
return ActionStopState;
|
||||
case "delay":
|
||||
@@ -58,6 +63,10 @@ export const getOptionManager = <T extends AutomationNodeTypes>(
|
||||
return TriggerHAState;
|
||||
case "mqtt":
|
||||
return TriggerMQTTState;
|
||||
case "sun":
|
||||
return TriggerSunState;
|
||||
case "calendar":
|
||||
return TriggerCalendarState;
|
||||
case "numeric_state":
|
||||
return TriggerNumericState;
|
||||
case "state":
|
||||
|
||||
@@ -1,57 +1,55 @@
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { NodeEditor } from ".";
|
||||
import { ComponentStory } from "@storybook/react";
|
||||
import { NodeEditor, NodeEditorProps } from ".";
|
||||
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { Button } from "components/Inputs/Buttons/Button";
|
||||
import { useState } from "react";
|
||||
import { Modal } from "components/Modal";
|
||||
import { Page } from "components/Page";
|
||||
import { makeStory } from "devUtils";
|
||||
|
||||
export default {
|
||||
title: "NodeEditor",
|
||||
component: NodeEditor,
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
args: {
|
||||
node: {
|
||||
data: {},
|
||||
service: "",
|
||||
target: "",
|
||||
const { componentMeta, make } = makeStory({
|
||||
meta: {
|
||||
title: "NodeEditor",
|
||||
args: {
|
||||
node: {
|
||||
data: {},
|
||||
service: "",
|
||||
target: "",
|
||||
},
|
||||
},
|
||||
},
|
||||
} as ComponentMeta<typeof NodeEditor>;
|
||||
Component: (props: NodeEditorProps) => {
|
||||
const [state, setState] = useState(props.node);
|
||||
return (
|
||||
<Page>
|
||||
<NodeEditor
|
||||
{...props}
|
||||
node={state}
|
||||
onSave={(s) => {
|
||||
setState(s);
|
||||
props.onSave && props.onSave(s);
|
||||
}}
|
||||
/>
|
||||
</Page>
|
||||
);
|
||||
},
|
||||
});
|
||||
|
||||
const Base: ComponentStory<typeof NodeEditor> = (props) => {
|
||||
const [state, setState] = useState(props.node);
|
||||
return (
|
||||
<Page>
|
||||
<NodeEditor
|
||||
{...props}
|
||||
node={state}
|
||||
onSave={(s) => {
|
||||
setState(s);
|
||||
props.onSave && props.onSave(s);
|
||||
}}
|
||||
/>
|
||||
</Page>
|
||||
);
|
||||
};
|
||||
export const Action = Base.bind({});
|
||||
export const SingleOption = Action.bind({});
|
||||
SingleOption.args = {
|
||||
...SingleOption.args,
|
||||
export default componentMeta;
|
||||
|
||||
export const Action = make({});
|
||||
export const SingleOption = make({
|
||||
allowedTypes: ["action"],
|
||||
};
|
||||
export const Condition = Action.bind({});
|
||||
Condition.args = {
|
||||
...Condition.args,
|
||||
});
|
||||
export const Condition = make({
|
||||
node: {
|
||||
condition: "and",
|
||||
conditions: [
|
||||
{
|
||||
condition: "numeric_state",
|
||||
entity_id: ["sensor.kitchen_humidity"],
|
||||
conditions: [],
|
||||
above: "40",
|
||||
},
|
||||
{
|
||||
@@ -59,26 +57,22 @@ Condition.args = {
|
||||
value_template: "states('switch.kitchen') == 'on'",
|
||||
},
|
||||
],
|
||||
} as AutomationCondition,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
export const UnSupported = Action.bind({});
|
||||
UnSupported.args = {
|
||||
...UnSupported.args,
|
||||
export const UnSupported = make({
|
||||
node: {
|
||||
condition: "bargs",
|
||||
platform: "rouge",
|
||||
} as any,
|
||||
};
|
||||
});
|
||||
|
||||
export const DeviceTriggerExample = Action.bind({});
|
||||
DeviceTriggerExample.args = {
|
||||
...DeviceTriggerExample.args,
|
||||
export const DeviceTriggerExample = make({
|
||||
node: {
|
||||
platform: "device",
|
||||
device_id: "bd83b10cb1c7aa028c12dade5b4e87d5",
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
export const InAModal: ComponentStory<typeof NodeEditor> = (props) => {
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -92,19 +86,15 @@ export const InAModal: ComponentStory<typeof NodeEditor> = (props) => {
|
||||
);
|
||||
};
|
||||
|
||||
export const ServiceExample = Action.bind({});
|
||||
ServiceExample.args = {
|
||||
...ServiceExample.args,
|
||||
export const ServiceExample = make({
|
||||
node: {
|
||||
target: {},
|
||||
data: {},
|
||||
service: "",
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
export const ServiceWithDataExample = Action.bind({});
|
||||
ServiceWithDataExample.args = {
|
||||
...ServiceWithDataExample.args,
|
||||
export const ServiceWithDataExample = make({
|
||||
node: {
|
||||
target: {
|
||||
entity: "light.switch_baby",
|
||||
@@ -114,37 +104,29 @@ ServiceWithDataExample.args = {
|
||||
},
|
||||
service: "light.turn_on",
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
export const DelayExample = Action.bind({});
|
||||
DelayExample.args = {
|
||||
...DelayExample.args,
|
||||
export const DelayExample = make({
|
||||
node: {
|
||||
wait_template: "",
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
export const StateTriggerExample = Action.bind({});
|
||||
StateTriggerExample.args = {
|
||||
...StateTriggerExample.args,
|
||||
export const StateTriggerExample = make({
|
||||
node: {
|
||||
platform: "state",
|
||||
entity_id: "binary_sensor.door_main",
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
export const DeviceActionFilledExample = Action.bind({});
|
||||
DeviceActionFilledExample.args = {
|
||||
...DeviceActionFilledExample.args,
|
||||
export const DeviceActionFilledExample = make({
|
||||
node: {
|
||||
type: "toggle",
|
||||
device_id: "c9711be86b0301955f72380509285485",
|
||||
},
|
||||
};
|
||||
} as any,
|
||||
});
|
||||
|
||||
export const NotifyPhoneViaDeviceAction = Action.bind({});
|
||||
NotifyPhoneViaDeviceAction.args = {
|
||||
...NotifyPhoneViaDeviceAction.args,
|
||||
export const NotifyPhoneViaDeviceAction = make({
|
||||
node: {
|
||||
device_id: "2a98db84af7526c7ec3cc7aebd1a9e1c",
|
||||
domain: "mobile_app",
|
||||
@@ -152,4 +134,11 @@ NotifyPhoneViaDeviceAction.args = {
|
||||
title: "Hassio Status",
|
||||
message: "Hassio Is turning off...",
|
||||
} as any,
|
||||
};
|
||||
});
|
||||
|
||||
export const Sun = make({
|
||||
node: {
|
||||
platform: "sun",
|
||||
event: "sunset",
|
||||
},
|
||||
});
|
||||
@@ -4,10 +4,25 @@ const subtypeDescMap: Partial<Record<AutomationNodeSubtype, string>> = {
|
||||
choose: "create conditional if/else statements",
|
||||
parallel: "run multiple nodes at the same time",
|
||||
stop: "stop the automation with a status code",
|
||||
scene: "activate a scene.",
|
||||
wait: "wait based on a condition",
|
||||
repeat: "repeat a sequence until or while some conditions are met",
|
||||
device: "device related actions",
|
||||
service: "call a service",
|
||||
event: "fires when an event is being received.",
|
||||
homeassistant: "fires when Home Assistant starts up or shuts down.",
|
||||
mqtt: "fires when a specific message is received on given MQTT topic.",
|
||||
sun: "fires when the sun is setting or rising.",
|
||||
numeric_state:
|
||||
"fires when the numeric value of an entity's state or attribute changes.",
|
||||
state: "fires when an entity's state or attribute changes",
|
||||
template: "evaluate a custom template",
|
||||
time: "specify a certain time to run",
|
||||
webhook:
|
||||
"webhook trigger fires when a web request is made to the webhook endpoint",
|
||||
zone: "specify when an entity enters or leaves a zone",
|
||||
tag: "fires when a tag is scanned.",
|
||||
calendar: "fires when a Calendar event starts or ends.",
|
||||
};
|
||||
|
||||
export const getNodeSubTypeDescription = (
|
||||
|
||||
@@ -28,6 +28,7 @@ export type DelayAction = st.Infer<typeof v.DelayAction>;
|
||||
export type FireEventAction = st.Infer<typeof v.FireEventAction>;
|
||||
export type DeviceAction = st.Infer<typeof v.DeviceAction>;
|
||||
export type StopAction = st.Infer<typeof v.StopAction>;
|
||||
export type SceneAction = st.Infer<typeof v.SceneAction>;
|
||||
export type ChooseAction = OriginalChooseAction | IfElseAction;
|
||||
export type OriginalChooseAction = AutomationActionNodeBase<{
|
||||
choose: Array<{
|
||||
@@ -58,6 +59,7 @@ export type ActionTypeMapping = {
|
||||
stop: StopAction;
|
||||
choose: ChooseAction;
|
||||
parallel: ParallelAction;
|
||||
scene: SceneAction;
|
||||
};
|
||||
export type AutomationAction =
|
||||
| ServiceAction
|
||||
@@ -68,5 +70,6 @@ export type AutomationAction =
|
||||
| StopAction
|
||||
| ChooseAction
|
||||
| ParallelAction
|
||||
| SceneAction
|
||||
| DelayAction;
|
||||
export type ActionType = keyof ActionTypeMapping;
|
||||
@@ -26,6 +26,10 @@ export type AutomationTriggerZone = st.Infer<typeof v.AutomationTriggerZone>;
|
||||
export type AutomationTriggerDevice = st.Infer<
|
||||
typeof v.AutomationTriggerDevice
|
||||
>;
|
||||
export type AutomationTriggerSun = st.Infer<typeof v.AutomationTriggerSun>;
|
||||
export type AutomationTriggerCalendar = st.Infer<
|
||||
typeof v.AutomationTriggerCalendar
|
||||
>;
|
||||
|
||||
export type ActionTriggerMapping = {
|
||||
homeassistant: AutomationTriggerHA;
|
||||
@@ -39,6 +43,8 @@ export type ActionTriggerMapping = {
|
||||
time: AutomationTriggerTime;
|
||||
webhook: AutomationTriggerWebhook;
|
||||
zone: AutomationTriggerZone;
|
||||
sun: AutomationTriggerSun;
|
||||
calendar: AutomationTriggerCalendar;
|
||||
};
|
||||
|
||||
export type TriggerType = keyof ActionTriggerMapping;
|
||||
@@ -54,4 +60,6 @@ export type AutomationTrigger =
|
||||
| AutomationTriggerTime
|
||||
| AutomationTriggerWebhook
|
||||
| AutomationTriggerZone
|
||||
| AutomationTriggerDevice;
|
||||
| AutomationTriggerDevice
|
||||
| AutomationTriggerSun
|
||||
| AutomationTriggerCalendar;
|
||||
@@ -79,6 +79,13 @@ export const StopAction = st.assign(
|
||||
})
|
||||
);
|
||||
|
||||
export const SceneAction = st.assign(
|
||||
AutomationActionNodeBase,
|
||||
st.type({
|
||||
scene: st.string(),
|
||||
})
|
||||
);
|
||||
|
||||
export const OriginalChooseAction = st.intersection([
|
||||
AutomationActionNodeBase,
|
||||
st.type({
|
||||
|
||||
@@ -96,6 +96,20 @@ export const AutomationTriggerZone = st.type({
|
||||
event: st.enums(["enter", "leave"]),
|
||||
});
|
||||
|
||||
export const AutomationTriggerSun = st.type({
|
||||
...AutomationTriggerBase,
|
||||
platform: st.literal("sun"),
|
||||
event: st.enums(["sunset", "sunrise"]),
|
||||
offset: st.optional(st.string()),
|
||||
});
|
||||
|
||||
export const AutomationTriggerCalendar = st.type({
|
||||
...AutomationTriggerBase,
|
||||
platform: st.literal("calendar"),
|
||||
event: st.enums(["start", "end"]),
|
||||
offset: st.optional(st.string()),
|
||||
});
|
||||
|
||||
export const AutomationTriggerDevice = st.type({
|
||||
...AutomationTriggerBase,
|
||||
..._AutomationDeviceState,
|
||||
@@ -103,6 +117,7 @@ export const AutomationTriggerDevice = st.type({
|
||||
});
|
||||
|
||||
export const AutomationTrigger = st.union([
|
||||
AutomationTriggerSun,
|
||||
AutomationTriggerEvent,
|
||||
AutomationTriggerHA,
|
||||
AutomationTriggerMQTT,
|
||||
|
||||
@@ -50,6 +50,7 @@ export const getSubTypeList = <T extends AutomationNodeTypes>(nodeType: T) => {
|
||||
"stop",
|
||||
"choose",
|
||||
"parallel",
|
||||
"scene",
|
||||
] as AutomationNodeSubtype<"action">[];
|
||||
case "condition":
|
||||
return [
|
||||
@@ -73,6 +74,8 @@ export const getSubTypeList = <T extends AutomationNodeTypes>(nodeType: T) => {
|
||||
"zone",
|
||||
"event",
|
||||
"homeassistant",
|
||||
"sun",
|
||||
"calendar",
|
||||
"mqtt",
|
||||
"tag",
|
||||
"template",
|
||||
@@ -143,6 +146,8 @@ export const getNodeSubType = <
|
||||
return "stop" as any;
|
||||
} else if ("parallel" in node) {
|
||||
return "parallel" as any;
|
||||
} else if ("scene" in node) {
|
||||
return "scene" as any;
|
||||
} else if (!ignoreInvalid) {
|
||||
throw new Error("Invalid node type!");
|
||||
}
|
||||
@@ -161,6 +166,8 @@ export const TriggerValidators: Record<TriggerType, any> = {
|
||||
time: v.triggers.AutomationTriggerTime,
|
||||
webhook: v.triggers.AutomationTriggerWebhook,
|
||||
zone: v.triggers.AutomationTriggerZone,
|
||||
sun: v.triggers.AutomationTriggerSun,
|
||||
calendar: v.triggers.AutomationTriggerCalendar,
|
||||
};
|
||||
|
||||
export const ActionValidators: Record<ActionType, any> = {
|
||||
@@ -171,6 +178,7 @@ export const ActionValidators: Record<ActionType, any> = {
|
||||
repeat: v.actions.RepeatAction,
|
||||
service: v.actions.ServiceAction,
|
||||
stop: v.actions.StopAction,
|
||||
scene: v.actions.SceneAction,
|
||||
wait: st.union([v.actions.DelayAction, v.actions.WaitAction]),
|
||||
};
|
||||
|
||||
|
||||
@@ -48,7 +48,6 @@ export const getConditionDefaultValues = (
|
||||
condition,
|
||||
zone: "",
|
||||
entity_id: [],
|
||||
state: [],
|
||||
} as ZoneCondition;
|
||||
} else if (condition === "device") {
|
||||
return {
|
||||
|
||||
Reference in new issue
Block a user