From e99143139e845581d8e6c3239b04a27268e74782 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 2 May 2022 23:47:43 +0200
Subject: [PATCH] Fix script graph parallel (#12545)

---
 src/components/trace/hat-script-graph.ts | 16 +++++++++++++++-
 src/data/script.ts                       |  2 +-
 src/data/trace.ts                        |  6 +++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/trace/hat-script-graph.ts b/src/components/trace/hat-script-graph.ts
index 45ea965b03..b43dd2749e 100644
--- a/src/components/trace/hat-script-graph.ts
+++ b/src/components/trace/hat-script-graph.ts
@@ -34,6 +34,7 @@ import {
   DeviceAction,
   EventAction,
   IfAction,
+  ManualScriptConfig,
   ParallelAction,
   RepeatAction,
   SceneAction,
@@ -478,7 +479,20 @@ export class HatScriptGraph extends LitElement {
           nofocus
         ></hat-graph-node>
         ${ensureArray(node.parallel).map((action, i) =>
-          this.render_action_node(action, `${path}/parallel/${i}/0`)
+          "sequence" in action
+            ? html`<div ?track=${path in this.trace.trace}>
+                ${ensureArray((action as ManualScriptConfig).sequence).map(
+                  (sAction, j) =>
+                    this.render_action_node(
+                      sAction,
+                      `${path}/parallel/${i}/sequence/${j}`
+                    )
+                )}
+              </div>`
+            : this.render_action_node(
+                action,
+                `${path}/parallel/${i}/sequence/0`
+              )
         )}
       </hat-graph-branch>
     `;
diff --git a/src/data/script.ts b/src/data/script.ts
index ada068d25e..017a72cc88 100644
--- a/src/data/script.ts
+++ b/src/data/script.ts
@@ -214,7 +214,7 @@ export interface StopAction extends BaseAction {
 }
 
 export interface ParallelAction extends BaseAction {
-  parallel: Action | Action[];
+  parallel: ManualScriptConfig | Action | (ManualScriptConfig | Action)[];
 }
 
 interface UnknownAction extends BaseAction {
diff --git a/src/data/trace.ts b/src/data/trace.ts
index ae9a4b0738..600d6c9466 100644
--- a/src/data/trace.ts
+++ b/src/data/trace.ts
@@ -185,7 +185,11 @@ export const getDataFromPath = (
     const asNumber = Number(raw);
 
     if (isNaN(asNumber)) {
-      result = result[raw];
+      const tempResult = result[raw];
+      if (!tempResult && raw === "sequence") {
+        continue;
+      }
+      result = tempResult;
       continue;
     }