From 3ad93f7c3b06d01909fbfc1a45b7ef8d2fc52356 Mon Sep 17 00:00:00 2001
From: Ben Stein <bsstein@sei.cmu.edu>
Date: Tue, 13 Feb 2024 09:57:08 -0500
Subject: [PATCH 1/6] Add easy support code copy to the ticket details page.

---
 projects/gameboard-ui/src/app/services/router.service.ts  | 4 ++--
 .../support/ticket-details/ticket-details.component.html  | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/projects/gameboard-ui/src/app/services/router.service.ts b/projects/gameboard-ui/src/app/services/router.service.ts
index 5962fe11..67106d05 100644
--- a/projects/gameboard-ui/src/app/services/router.service.ts
+++ b/projects/gameboard-ui/src/app/services/router.service.ts
@@ -1,6 +1,7 @@
-import { ReportKey } from '@/reports/reports-models';
 import { Injectable, OnDestroy } from '@angular/core';
 import { NavigationEnd, ActivatedRoute, Params, Router, UrlTree } from '@angular/router';
+import { Subscription, filter } from 'rxjs';
+import { ReportKey } from '@/reports/reports-models';
 import { BrowserService } from './browser.service';
 import { ObjectService } from './object.service';
 import { VmState } from '@/api/board-models';
@@ -13,7 +14,6 @@ export interface QueryParamsUpdate {
   parameters: Params,
   resetParams?: string[]
 }
-import { Subscription, filter } from 'rxjs';
 
 @Injectable({ providedIn: 'root' })
 export class RouterService implements OnDestroy {
diff --git a/projects/gameboard-ui/src/app/support/ticket-details/ticket-details.component.html b/projects/gameboard-ui/src/app/support/ticket-details/ticket-details.component.html
index 2d56d6f4..9e485b1a 100644
--- a/projects/gameboard-ui/src/app/support/ticket-details/ticket-details.component.html
+++ b/projects/gameboard-ui/src/app/support/ticket-details/ticket-details.component.html
@@ -263,8 +263,12 @@ <h4 class="mt-2 d-flex justify-content-between">
                 <app-inplace-editor [editData]="challenges" [currentText]="changedTicket.challenge?.name || 'None'"
                   (startEditFunc)="startEditChallenge()"
                   (selectOptionFunc)="selectChallenge($event)"></app-inplace-editor>
-                <p *ngIf="changedTicket.challenge" class="mb-0  pt-0 mb-1 px-2 align-items-center small">Support Code:
-                  {{(changedTicket.challenge.id | slice:0:8) + ' ' + changedTicket.challenge.tag}}</p>
+                <p *ngIf="changedTicket.challenge" class="mb-0  pt-0 mb-1 px-2 align-items-center small">
+                  Support Code: <span appCopyOnClick class="text-info cursor-pointer">{{(changedTicket.challenge.id |
+                    slice:0:8) + ' '
+                    +
+                    changedTicket.challenge.tag}}</span>
+                </p>
               </div>
               <div class="form-group p-0 m-0 mb-4">
                 <label class="font-weight-bold" for="assignee-input">Game Session <fa-icon

From 21972f56789182c810130e5e0993b31679052de8 Mon Sep 17 00:00:00 2001
From: Ben Stein <bsstein@sei.cmu.edu>
Date: Tue, 13 Feb 2024 10:43:48 -0500
Subject: [PATCH 2/6] Add absolute url handling in router service.

---
 .../scoreboard-team-detail-modal.component.ts    |  1 -
 .../src/app/services/router.service.ts           | 16 +++++++++++-----
 .../gameboard-ui/src/environments/environment.ts |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/projects/gameboard-ui/src/app/game/components/scoreboard-team-detail-modal/scoreboard-team-detail-modal.component.ts b/projects/gameboard-ui/src/app/game/components/scoreboard-team-detail-modal/scoreboard-team-detail-modal.component.ts
index 8027d553..3dccb6e7 100644
--- a/projects/gameboard-ui/src/app/game/components/scoreboard-team-detail-modal/scoreboard-team-detail-modal.component.ts
+++ b/projects/gameboard-ui/src/app/game/components/scoreboard-team-detail-modal/scoreboard-team-detail-modal.component.ts
@@ -65,7 +65,6 @@ export class ScoreboardTeamDetailModalComponent implements OnInit {
         .manualBonuses
         .map(b => b.pointValue)
         .reduce((accumulator, nextValue) => accumulator + nextValue);
-
     }
   }
 
diff --git a/projects/gameboard-ui/src/app/services/router.service.ts b/projects/gameboard-ui/src/app/services/router.service.ts
index 67106d05..e92b5a22 100644
--- a/projects/gameboard-ui/src/app/services/router.service.ts
+++ b/projects/gameboard-ui/src/app/services/router.service.ts
@@ -5,10 +5,15 @@ import { ReportKey } from '@/reports/reports-models';
 import { BrowserService } from './browser.service';
 import { ObjectService } from './object.service';
 import { VmState } from '@/api/board-models';
+import { PlayerMode } from '@/api/player-models';
 import { ConfigService } from '@/utility/config.service';
 import { UserService as LocalUser } from '@/utility/user.service';
 import { slug } from "@/tools/functions";
-import { PlayerMode } from '@/api/player-models';
+
+export interface RouterUrlOptions {
+  asAbsolute?: boolean;
+  queryParameters?: { [key: string]: string; };
+}
 
 export interface QueryParamsUpdate {
   parameters: Params,
@@ -27,8 +32,8 @@ export class RouterService implements OnDestroy {
     public router: Router,
     private objectService: ObjectService) { }
 
-  public getCurrentPathBase(): string {
-    let urlTree = this.router.parseUrl(this.router.url);
+  public getCurrentPathBase(options?: RouterUrlOptions): string {
+    const urlTree = this.router.parseUrl(this.router.url);
     urlTree.queryParams = {};
     return urlTree.toString();
   }
@@ -41,8 +46,9 @@ export class RouterService implements OnDestroy {
     this.router.navigateByUrl("/");
   }
 
-  public getAdminChallengeUrl(challengeId: string) {
-    return this.router.createUrlTree(["admin", "support"], { queryParams: { search: challengeId } }).toString();
+  public getAdminChallengeUrl(challengeId: string, options?: RouterUrlOptions) {
+    const absoluteUrlOptionalPath = options?.asAbsolute ? this.config.basehref + this.getCurrentPathBase() : "";
+    return this.router.createUrlTree([absoluteUrlOptionalPath, "admin", "support"], { queryParams: { search: challengeId } }).toString();
   }
 
   public getAdminGamePlayerUrl(gameId: string, playerId: string) {
diff --git a/projects/gameboard-ui/src/environments/environment.ts b/projects/gameboard-ui/src/environments/environment.ts
index 50dee710..6cee371b 100644
--- a/projects/gameboard-ui/src/environments/environment.ts
+++ b/projects/gameboard-ui/src/environments/environment.ts
@@ -4,11 +4,11 @@ export const environment = {
   settings: {
     appname: 'Gameboard',
     apphost: 'http://localhost:5002',
+    basehref: "gb",
     mkshost: 'http://localhost:4201',
     imghost: 'http://localhost:5002/img',
     tochost: 'http://localhost:5002/doc',
     supporthost: 'http://localhost:5002/supportfiles',
-    gamebrainhost: '',
     unityhost: '',
     tocfile: '',
     countdownStartSecondsAtMinute: 5,

From 7ec9e1517b836ee71b95b7a0dc5f487ca54834ba Mon Sep 17 00:00:00 2001
From: Ben Stein <bsstein@sei.cmu.edu>
Date: Tue, 13 Feb 2024 11:28:56 -0500
Subject: [PATCH 3/6] Correct support tools links

---
 .../src/app/services/router.service.ts        | 28 ++++++++++---------
 .../ticket-support-tools.component.ts         |  4 +--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/projects/gameboard-ui/src/app/services/router.service.ts b/projects/gameboard-ui/src/app/services/router.service.ts
index e92b5a22..1af0a0ec 100644
--- a/projects/gameboard-ui/src/app/services/router.service.ts
+++ b/projects/gameboard-ui/src/app/services/router.service.ts
@@ -10,11 +10,6 @@ import { ConfigService } from '@/utility/config.service';
 import { UserService as LocalUser } from '@/utility/user.service';
 import { slug } from "@/tools/functions";
 
-export interface RouterUrlOptions {
-  asAbsolute?: boolean;
-  queryParameters?: { [key: string]: string; };
-}
-
 export interface QueryParamsUpdate {
   parameters: Params,
   resetParams?: string[]
@@ -32,7 +27,7 @@ export class RouterService implements OnDestroy {
     public router: Router,
     private objectService: ObjectService) { }
 
-  public getCurrentPathBase(options?: RouterUrlOptions): string {
+  public getCurrentPathBase(): string {
     const urlTree = this.router.parseUrl(this.router.url);
     urlTree.queryParams = {};
     return urlTree.toString();
@@ -46,13 +41,12 @@ export class RouterService implements OnDestroy {
     this.router.navigateByUrl("/");
   }
 
-  public getAdminChallengeUrl(challengeId: string, options?: RouterUrlOptions) {
-    const absoluteUrlOptionalPath = options?.asAbsolute ? this.config.basehref + this.getCurrentPathBase() : "";
-    return this.router.createUrlTree([absoluteUrlOptionalPath, "admin", "support"], { queryParams: { search: challengeId } }).toString();
+  public getAdminChallengeUrl(challengeId: string) {
+    return this.buildAppUrlWithQueryParams({ queryParams: { search: challengeId } }, "admin", "support").toString();
   }
 
   public getAdminGamePlayerUrl(gameId: string, playerId: string) {
-    return this.router.createUrlTree(["admin", "registrar", gameId], { queryParams: { term: playerId } });
+    return this.buildAppUrlWithQueryParams({ queryParams: { term: playerId } }, "admin", "registrar", gameId).toString();
   }
 
   public getCertificatePrintableUrl(mode: PlayerMode, challengeSpecOrGameId: string) {
@@ -149,12 +143,12 @@ export class RouterService implements OnDestroy {
     return this.router.createUrlTree(["game", "board", playerId]);
   }
 
-  public getGamePageUrlTree(gameId: string): UrlTree {
-    return this.router.parseUrl(`/game/${gameId}`);
+  public getGamePageUrl(gameId: string) {
+    return this.buildAppUrl("game", "gameId");
   }
 
   public goToGamePage(gameId: string) {
-    this.router.navigateByUrl(this.getGamePageUrlTree(gameId));
+    this.router.navigateByUrl(this.getGamePageUrl(gameId).toString());
   }
 
   public getUnityBoardUrlTree(ctx: { gameId: string, playerId: string, teamId: string; sessionEnd: number }) {
@@ -184,6 +178,14 @@ export class RouterService implements OnDestroy {
     return this.router.navigateByUrl(urlTree);
   }
 
+  private buildAppUrl(...urlBits: string[]) {
+    return this.buildAppUrlWithQueryParams(null, ...urlBits);
+  }
+
+  private buildAppUrlWithQueryParams(queryParams: any, ...urlBits: string[]) {
+    return this.router.createUrlTree([this.config.basehref || "", ...urlBits], { queryParams });
+  }
+
   ngOnDestroy(): void {
     this._navEndSub?.unsubscribe();
   }
diff --git a/projects/gameboard-ui/src/app/support/components/ticket-support-tools/ticket-support-tools.component.ts b/projects/gameboard-ui/src/app/support/components/ticket-support-tools/ticket-support-tools.component.ts
index 4ad67a9a..3209333f 100644
--- a/projects/gameboard-ui/src/app/support/components/ticket-support-tools/ticket-support-tools.component.ts
+++ b/projects/gameboard-ui/src/app/support/components/ticket-support-tools/ticket-support-tools.component.ts
@@ -71,10 +71,10 @@ export class TicketSupportToolsComponent implements OnInit {
     }
 
     if (this.context?.game) {
-      this.gameboardUrl = hasGame ? this.routerService.getGamePageUrlTree(this.context.game!.id).toString() : undefined;
+      this.gameboardUrl = hasGame ? this.routerService.getGamePageUrl(this.context.game!.id).toString() : undefined;
 
       if (this.context?.player) {
-        this.playerAdminUrl = hasGame ? this.routerService.getAdminGamePlayerUrl(this.context.game!.id, this.context.player.id).toString() : undefined;
+        this.playerAdminUrl = hasGame ? this.routerService.getAdminGamePlayerUrl(this.context.game!.id, this.context.player.id) : undefined;
       }
     }
 

From 582de123cf58b643b21aac4379453c3caa55f25d Mon Sep 17 00:00:00 2001
From: Ben Stein <bsstein@sei.cmu.edu>
Date: Tue, 13 Feb 2024 11:49:10 -0500
Subject: [PATCH 4/6] More support url bugs and make player registrar view
 searched player

---
 .../app/admin/player-registrar/player-registrar.component.ts  | 3 +++
 projects/gameboard-ui/src/app/services/router.service.ts      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts b/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts
index 5b86dc93..4c22ba29 100644
--- a/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts
+++ b/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts
@@ -95,6 +95,8 @@ export class PlayerRegistrarComponent {
       switchMap(() => this.api.list(this.search)),
       tap(r => this.source = r),
       tap(() => this.isLoading = false),
+      tap(() => this.viewed = !this.viewed && this.search.term ? this.source.find(p => p.id === this.search.term) : this.viewed),
+      tap(() => console.log("viewed", this.viewed)),
       tap(() => this.review())
     );
 
@@ -178,6 +180,7 @@ export class PlayerRegistrarComponent {
   }
 
   review(): void {
+    console.log("reviewing", this.viewed?.id);
     this.viewed = this.source.find(g => g.id === this.viewed?.id);
     this.selected.forEach(s => {
       const t = this.source.find(g => g.id === s.id);
diff --git a/projects/gameboard-ui/src/app/services/router.service.ts b/projects/gameboard-ui/src/app/services/router.service.ts
index 1af0a0ec..57fcd686 100644
--- a/projects/gameboard-ui/src/app/services/router.service.ts
+++ b/projects/gameboard-ui/src/app/services/router.service.ts
@@ -144,7 +144,7 @@ export class RouterService implements OnDestroy {
   }
 
   public getGamePageUrl(gameId: string) {
-    return this.buildAppUrl("game", "gameId");
+    return this.buildAppUrl("game", gameId);
   }
 
   public goToGamePage(gameId: string) {
@@ -183,7 +183,7 @@ export class RouterService implements OnDestroy {
   }
 
   private buildAppUrlWithQueryParams(queryParams: any, ...urlBits: string[]) {
-    return this.router.createUrlTree([this.config.basehref || "", ...urlBits], { queryParams });
+    return this.router.createUrlTree([this.config.basehref || "", ...urlBits], { ...queryParams });
   }
 
   ngOnDestroy(): void {

From 71d0d338d73f2cda0f566ee4f0f9144885c16b2b Mon Sep 17 00:00:00 2001
From: Ben Stein <bsstein@sei.cmu.edu>
Date: Tue, 13 Feb 2024 11:49:40 -0500
Subject: [PATCH 5/6] Remove logging

---
 .../app/admin/player-registrar/player-registrar.component.ts    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts b/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts
index 4c22ba29..2085c6d6 100644
--- a/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts
+++ b/projects/gameboard-ui/src/app/admin/player-registrar/player-registrar.component.ts
@@ -96,7 +96,6 @@ export class PlayerRegistrarComponent {
       tap(r => this.source = r),
       tap(() => this.isLoading = false),
       tap(() => this.viewed = !this.viewed && this.search.term ? this.source.find(p => p.id === this.search.term) : this.viewed),
-      tap(() => console.log("viewed", this.viewed)),
       tap(() => this.review())
     );
 
@@ -180,7 +179,6 @@ export class PlayerRegistrarComponent {
   }
 
   review(): void {
-    console.log("reviewing", this.viewed?.id);
     this.viewed = this.source.find(g => g.id === this.viewed?.id);
     this.selected.forEach(s => {
       const t = this.source.find(g => g.id === s.id);

From 03e9d904621d3cf113e3050c94f27a80bb025574 Mon Sep 17 00:00:00 2001
From: Ben Stein <bsstein@sei.cmu.edu>
Date: Tue, 13 Feb 2024 13:57:53 -0500
Subject: [PATCH 6/6] Fixed an issue that made the support code copy
 incorrectly on ticket details

---
 .../src/app/core/directives/copy-on-click.directive.ts         | 2 +-
 .../app/support/ticket-details/ticket-details.component.html   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/gameboard-ui/src/app/core/directives/copy-on-click.directive.ts b/projects/gameboard-ui/src/app/core/directives/copy-on-click.directive.ts
index a74dc6b8..fe45de34 100644
--- a/projects/gameboard-ui/src/app/core/directives/copy-on-click.directive.ts
+++ b/projects/gameboard-ui/src/app/core/directives/copy-on-click.directive.ts
@@ -18,7 +18,7 @@ export class CopyOnClickDirective implements AfterViewInit {
       if (existingOnClick)
         existingOnClick();
 
-      const text = this.text || this.elementRef.nativeElement.innerHTML;
+      const text = this.text || this.elementRef.nativeElement.innerHTML.trim();
       if (text) {
         this.clipboardService.copy(text);
         this.toastService.showMessage(`Copied "${text}" to your clipboard.`);
diff --git a/projects/gameboard-ui/src/app/support/ticket-details/ticket-details.component.html b/projects/gameboard-ui/src/app/support/ticket-details/ticket-details.component.html
index 9e485b1a..7c372d80 100644
--- a/projects/gameboard-ui/src/app/support/ticket-details/ticket-details.component.html
+++ b/projects/gameboard-ui/src/app/support/ticket-details/ticket-details.component.html
@@ -266,8 +266,7 @@ <h4 class="mt-2 d-flex justify-content-between">
                 <p *ngIf="changedTicket.challenge" class="mb-0  pt-0 mb-1 px-2 align-items-center small">
                   Support Code: <span appCopyOnClick class="text-info cursor-pointer">{{(changedTicket.challenge.id |
                     slice:0:8) + ' '
-                    +
-                    changedTicket.challenge.tag}}</span>
+                    + (changedTicket.challenge.tag || '')}}</span>
                 </p>
               </div>
               <div class="form-group p-0 m-0 mb-4">