From ab7f50d4aa70dcd3a83af3fdffa80161f19366f8 Mon Sep 17 00:00:00 2001 From: Ari Date: Fri, 5 Aug 2022 22:04:11 -0400 Subject: [PATCH] fixed trigger device validation --- webapp/src/components/DAGGraph/updater/index.ts | 3 +++ .../NodeEditor/OptionManager/TriggerDevice.tsx | 6 ++++++ webapp/src/types/validators/common.ts | 5 +++-- webapp/src/types/validators/triggers.ts | 17 ++++++----------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/webapp/src/components/DAGGraph/updater/index.ts b/webapp/src/components/DAGGraph/updater/index.ts index e6487a0..7ef31d3 100644 --- a/webapp/src/components/DAGGraph/updater/index.ts +++ b/webapp/src/components/DAGGraph/updater/index.ts @@ -104,6 +104,9 @@ export const createUpdater = ( }), trigger: createBasicUpdater("trigger", { platform: "device", + domain: "", + type: "", + device_id: "", })({ trigger: args.trigger, openModal: args.openModal, diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerDevice.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerDevice.tsx index 4efb612..80ece98 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerDevice.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerDevice.tsx @@ -5,6 +5,9 @@ import { DeviceEditor } from "components/DeviceEditor"; export const TriggerDevice: OptionManager = { defaultState: () => ({ platform: "device", + device_id: "", + domain: "", + type: "", }), isReady: () => true, Component: ({ state, setState, ha }) => { @@ -27,6 +30,9 @@ export const TriggerDevice: OptionManager = { setState={(s) => setState({ platform: "device", + device_id: "", + domain: "", + type: "", ...s, }) } diff --git a/webapp/src/types/validators/common.ts b/webapp/src/types/validators/common.ts index 296ebe1..f005071 100644 --- a/webapp/src/types/validators/common.ts +++ b/webapp/src/types/validators/common.ts @@ -48,13 +48,14 @@ export const AutomationTimeObject = st.object({ milliseconds: st.optional(st.number()), }); export const AutomationTime = st.union([st.string(), AutomationTimeObject]); -export const AutomationDeviceState = st.type({ +export const _AutomationDeviceState = { subtype: st.optional(st.string()), entity_id: st.optional(st.string()), type: st.string(), device_id: st.string(), domain: st.string(), -}); +}; +export const AutomationDeviceState = st.type(_AutomationDeviceState); export const DayOfWeek = st.enums([ "mon", "tue", diff --git a/webapp/src/types/validators/triggers.ts b/webapp/src/types/validators/triggers.ts index 912f319..d6af473 100644 --- a/webapp/src/types/validators/triggers.ts +++ b/webapp/src/types/validators/triggers.ts @@ -1,8 +1,5 @@ import * as st from "superstruct"; -import { - AutomationTime, - AutomationDeviceState, -} from "./common"; +import { AutomationTime, _AutomationDeviceState } from "./common"; const AutomationTriggerBase = { id: st.optional(st.string()), @@ -99,13 +96,11 @@ export const AutomationTriggerZone = st.type({ event: st.enums(["enter", "leave"]), }); -export const AutomationTriggerDevice = st.assign( - st.partial(AutomationDeviceState), - st.type({ - ...AutomationTriggerBase, - platform: st.literal("device"), - }) -); +export const AutomationTriggerDevice = st.type({ + ...AutomationTriggerBase, + ..._AutomationDeviceState, + platform: st.literal("device"), +}); export const AutomationTrigger = st.union([ AutomationTriggerEvent,