diff --git a/gallery/src/data/traces/motion-light-trace.ts b/gallery/src/data/traces/motion-light-trace.ts index 0c72f82af6..623f135d66 100644 --- a/gallery/src/data/traces/motion-light-trace.ts +++ b/gallery/src/data/traces/motion-light-trace.ts @@ -2,6 +2,7 @@ import { DemoTrace } from "./types"; export const motionLightTrace: DemoTrace = { trace: { + automation_id: "", last_action: "action/3", last_condition: null, run_id: "1", diff --git a/src/data/automation_debug.ts b/src/data/automation_debug.ts index 2257d1e6bc..a29b874556 100644 --- a/src/data/automation_debug.ts +++ b/src/data/automation_debug.ts @@ -18,6 +18,14 @@ export interface ConditionTrace extends BaseTrace { result: { result: boolean }; } +export interface CallServiceActionTrace extends BaseTrace { + result: { + limit: number; + running_script: boolean; + params: Record; + }; +} + export interface ChooseActionTrace extends BaseTrace { result: { choice: number }; } @@ -28,10 +36,13 @@ export interface ChooseChoiceActionTrace extends BaseTrace { export type ActionTrace = | BaseTrace + | CallServiceActionTrace | ChooseActionTrace | ChooseChoiceActionTrace; export interface AutomationTrace { + automation_id: string; + unique_id: string; last_action: string | null; last_condition: string | null; run_id: string; @@ -41,7 +52,6 @@ export interface AutomationTrace { finish: string | null; }; trigger: unknown; - unique_id: string; } export interface AutomationTraceExtended extends AutomationTrace { diff --git a/src/data/script.ts b/src/data/script.ts index db6ce920ed..bce5274c2b 100644 --- a/src/data/script.ts +++ b/src/data/script.ts @@ -104,8 +104,13 @@ export interface UntilRepeat extends BaseRepeat { } export interface ChooseAction { - alias?: string; - choose: [{ conditions: Condition[]; sequence: Action[] }]; + choose: [ + { + alias?: string; + conditions: string | Condition[]; + sequence: Action[]; + } + ]; default?: Action[]; }