From 2a1d53865883401d64e73347eb28fe6f4d7ea1da Mon Sep 17 00:00:00 2001
From: Ben Stein <bsstein@sei.cmu.edu>
Date: Thu, 25 Jan 2024 15:58:31 -0500
Subject: [PATCH 1/2] Clean up error handling for extend.

---
 .../admin-player-session.component.html                    | 2 --
 .../admin-player-session/admin-player-session.component.ts | 7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.html b/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.html
index 0b354d89..e8700c50 100644
--- a/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.html
+++ b/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.html
@@ -1,8 +1,6 @@
 <!-- Copyright 2021 Carnegie Mellon University. All Rights Reserved. -->
 <!-- Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information. -->
 
-<app-error-div [errors]="errors"></app-error-div>
-
 <ng-container *ngIf="team$ | async as team; else loading">
   <div class="timeline-container px-3">
     <div>Timeline <span class="badge badge-info">[BETA]</span></div>
diff --git a/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.ts b/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.ts
index 0552e010..f1dfa42c 100644
--- a/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.ts
+++ b/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.ts
@@ -30,7 +30,7 @@ export class PlayerSessionComponent implements OnInit {
   showRaw = false;
   statusText = "Loading your session...";
   faInfo = faInfoCircle;
-  errors: any[] = [];
+  protected errors: any[] = [];
 
   protected isExtending = false;
   protected isLoadingChallenges = false;
@@ -53,14 +53,15 @@ export class PlayerSessionComponent implements OnInit {
     try {
       this.isExtending = true;
       await firstValueFrom(this.teamService.extendSession({ teamId: team.teamId, sessionEnd: team.sessionEnd }));
+
+      const friendlySessionEnd = DateTime.fromISO(team.sessionEnd.toString());
+      this.toastService.showMessage(`Team session extended to ${friendlySessionEnd.toLocaleString(DateTime.DATETIME_FULL)}.`);
     }
     catch (err: any) {
       this.errors.push(err);
     }
 
     this.isExtending = false;
-    const friendlySessionEnd = DateTime.fromISO(team.sessionEnd.toString());
-    this.toastService.showMessage(`Team session extended to ${friendlySessionEnd.toLocaleString(DateTime.DATETIME_FULL)}.`);
   }
 
   toggleRawView(isExpanding: boolean): void {

From ea8705e25529cbcd1d897f29b85fa5d785448e1d Mon Sep 17 00:00:00 2001
From: Ben Stein <bsstein@sei.cmu.edu>
Date: Thu, 25 Jan 2024 16:08:04 -0500
Subject: [PATCH 2/2] Hide session alignment warning in external game admin
 until deploy is done.

---
 .../external-game-admin/external-game-admin.component.html  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/gameboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.html b/projects/gameboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.html
index ca398144..bf673269 100644
--- a/projects/gameboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.html
+++ b/projects/gameboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.html
@@ -18,13 +18,13 @@ <h3 class="sync-session-date fs-12" *ngIf="sessionDateDescription">
             </app-confirm-button>
         </div>
 
-        <alert *ngIf="context.hasNonStandardSessionWindow" type="warning" class="my-4">
+        <alert *ngIf="context.startTime && context.hasNonStandardSessionWindow" type="warning" class="my-4">
             <h3>Warning</h3>
 
             <p>
                 This game has been deployed and started, but there are multiple "start" and "end" dates
-                among challenges and player sessions. You may need to use the session align tool to ensure
-                these line up (coming soon™).
+                among challenges and player sessions. If you see this and haven't manually extended
+                someone's session, there may be an issue.
             </p>
         </alert>