Guard against null gamespaceoff in event timeline.

cmu-sei · Jan 24, 2024 · 1eb2e17 · 1eb2e17
1 parent c298a31
commit 1eb2e17
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/projects/gameboard-ui/src/app/api/event-horizon.service.ts b/projects/gameboard-ui/src/app/api/event-horizon.service.ts
@@ -31,6 +31,7 @@ export class EventHorizonService {
           const timestamp = this.apiDateTimeService.toDateTime(event.timestamp as any);
           if (!timestamp)
             throw new Error(`Couldn't parse datetime for timeline event: ${JSON.stringify(event.timestamp)}`);
+
           event.timestamp = timestamp;
 
           // if this is a gamespace event, its eventData has another propert that needs help

diff --git a/projects/gameboard-ui/src/app/services/event-horizon-rendering.service.ts b/projects/gameboard-ui/src/app/services/event-horizon-rendering.service.ts
@@ -3,10 +3,13 @@ import { Injectable } from '@angular/core';
 import { DateTime } from 'luxon';
 import { MarkdownHelpersService } from './markdown-helpers.service';
 import { DataGroup } from 'vis-timeline';
+import { NowService } from './now.service';
 
 @Injectable({ providedIn: 'root' })
 export class EventHorizonRenderingService {
-  constructor(private markdownHelpers: MarkdownHelpersService) { }
+  constructor(
+    private markdownHelpers: MarkdownHelpersService,
+    private nowService: NowService) { }
 
   public getViewOptions(eventHorizonVm: TeamEventHorizonViewModel): EventHorizonViewOptions {
     const sessionEnd = eventHorizonVm.team.session.end || DateTime.now();
@@ -111,7 +114,7 @@ export class EventHorizonRenderingService {
     const typedEvent = timelineEvent as unknown as EventHorizonGamespaceOnOffEvent;
     const baseItem = this.toGenericDataItem(timelineEvent, challengeSpec, "Gamespace On", "eh-event-type-gamespace-on-off", false);
 
-    baseItem.end = typedEvent.eventData.offAt.toJSDate();
+    baseItem.end = typedEvent.eventData?.offAt?.toJSDate() || this.nowService.now();
     baseItem.eventData = typedEvent;
     baseItem.type = "background";