SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-turntracker/game-master-turntracker.component.ts

@@ -25,7 +25,11 @@ export class GameMasterTurntrackerComponent implements OnInit, OnDestroy {
     monsterId: number;
   }[] = [];
 
-  characterList: { name: string; characterId: number }[] = [];
+  characterList: {
+    name: string;
+    characterId: number;
+    monsterId: number;
+  }[] = [];
 
   drop(event: CdkDragDrop<any[]>) {
     if (event.previousContainer === event.container) {
@@ -52,7 +56,9 @@ export class GameMasterTurntrackerComponent implements OnInit, OnDestroy {
       .select((s) => s.gameMasterStore.turnTrackerList)
       .pipe(first())
       .subscribe((result) => {
+        if (result.length > 0) {
           this.turnTrackerList = result;
+        }
         this.GetLoggedCharacters();
       });
   }
@@ -72,6 +78,7 @@ export class GameMasterTurntrackerComponent implements OnInit, OnDestroy {
           .map((e) => ({
             name: e.name,
             characterId: e.id,
+            monsterId: null,
           }));
       });
   }