Merge "ui: Add area selections to permalinks" into main

google · Oct 21, 2024 · 2a3a762 · 2a3a762
2 parents 842f9c1 + dccfefa
commit 2a3a762
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/ui/src/core/load_trace.ts b/ui/src/core/load_trace.ts
@@ -257,6 +257,8 @@ async function loadTraceIntoEngine(
     }
   }
 
+  await trace.plugins.onTraceReady();
+
   if (serializedAppState !== undefined) {
     // Wait that plugins have completed their actions and then proceed with
     // the final phase of app state restore.
@@ -265,8 +267,6 @@ async function loadTraceIntoEngine(
     deserializeAppStatePhase2(serializedAppState, trace);
   }
 
-  await trace.plugins.onTraceReady();
-
   return trace;
 }
 

diff --git a/ui/src/core/state_serialization.ts b/ui/src/core/state_serialization.ts
@@ -83,6 +83,13 @@ export function serializeAppState(trace: TraceImpl): SerializedAppState {
       trackKey: stateSel.trackUri,
       eventId: stateSel.eventId.toString(),
     });
+  } else if (stateSel.kind === 'area') {
+    selection.push({
+      kind: 'AREA',
+      trackUris: stateSel.trackUris,
+      start: stateSel.start,
+      end: stateSel.end,
+    });
   }
 
   const plugins = new Array<SerializedPluginState>();
@@ -202,6 +209,12 @@ export function deserializeAppStatePhase2(
       case 'TRACK_EVENT':
         selMgr.selectTrackEvent(sel.trackKey, parseInt(sel.eventId));
         break;
+      case 'AREA':
+        selMgr.selectArea({
+          start: sel.start,
+          end: sel.end,
+          trackUris: sel.trackUris,
+        });
     }
   }
 }

diff --git a/ui/src/public/state_serialization_schema.ts b/ui/src/public/state_serialization_schema.ts
@@ -35,6 +35,12 @@ const SELECTION_SCHEMA = z.discriminatedUnion('kind', [
     trackKey: z.string(),
     eventId: z.string(),
   }),
+  z.object({
+    kind: z.literal('AREA'),
+    start: zTime,
+    end: zTime,
+    trackUris: z.array(z.string()),
+  }),
 ]);
 
 export type SerializedSelection = z.infer<typeof SELECTION_SCHEMA>;