MIsc bug fixes to external game deploy

cmu-sei · Nov 17, 2023 · df82d95 · df82d95
1 parent 5caa678
commit df82d95
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/...eboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.html b/...eboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.html
@@ -97,7 +97,7 @@ <h5>Challenges</h5>
                     </div>
                     <button type="button" href="#" class="btn btn-info"
                         (click)="handlePreDeployTeamClick(context.game.id, team.id)"
-                        [class.disabled]="!(team.challenges | externalTeamChallengesToIsPredeployable)">Predeploy</button>
+                        [class.disabled]="!canDeploy">Predeploy</button>
                 </div>
             </div>
         </div>

diff --git a/...eboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.scss b/...eboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.scss
@@ -13,7 +13,6 @@ h3.sync-session-date {
 
 .team-card {
     flex-basis: 48%;
-    flex-grow: 1;
 }
 
 .team-avatars-container {

diff --git a/...ameboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.ts b/...ameboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.ts
@@ -89,6 +89,7 @@ export class ExternalGameAdminComponent implements OnInit {
 
   protected async handlePreDeployAllClick(gameId: string) {
     try {
+      this.bindOverallDeployStatus("deploying");
       await firstValueFrom(this.externalGameService.preDeployAll(gameId));
     }
     catch (err: any) {
@@ -98,6 +99,7 @@ export class ExternalGameAdminComponent implements OnInit {
 
   protected async handlePreDeployTeamClick(gameId: string, teamId: string) {
     try {
+      this.bindOverallDeployStatus("deploying");
       await firstValueFrom(this.externalGameService.preDeployTeams(gameId, teamId));
     }
     catch (err: any) {
@@ -109,6 +111,17 @@ export class ExternalGameAdminComponent implements OnInit {
     this.forceRefresh$.next();
   }
 
+  private bindOverallDeployStatus(overallDeployStatus: DeployStatus) {
+    this.canDeploy = overallDeployStatus == "notStarted";
+
+    if (overallDeployStatus == "deploying") {
+      this.deployAllTooltip = "Resources are being deployed for this game. Hang tight...";
+    }
+    else if (overallDeployStatus == "deployed") {
+      this.deployAllTooltip = "All of this game's resources have been deployed.";
+    }
+  }
+
   private load(gameId: string) {
     this.gameId = gameId;
     this.ctx$ = this.externalGameService.getAdminContext(gameId).pipe(
@@ -119,14 +132,7 @@ export class ExternalGameAdminComponent implements OnInit {
       tap(ctx => {
         // do some fiddly computations to dealing with them in the template
         this.appTitleService.set(`${ctx.game.name} : External Game`);
-        this.canDeploy = ctx.overallDeployStatus == 'notStarted';
-
-        if (ctx.overallDeployStatus == "deploying") {
-          this.deployAllTooltip = "Resources are being deployed for this game. Hang tight...";
-        }
-        else if (ctx.overallDeployStatus == "deployed") {
-          this.deployAllTooltip = "All of this game's resources have been deployed.";
-        }
+        this.bindOverallDeployStatus(ctx.overallDeployStatus);
 
         this.sessionDateDescription = "";
         if (ctx.startTime && ctx.endTime) {