Merge pull request #1996 from DSD-DBS/session-focus

feat: Auto-focus first session in the session viewer
DSD-DBS · Nov 14, 2024 · ed2237d · ed2237d
2 parents d06c824 + 75f5a7f
commit ed2237d
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/frontend/src/app/sessions/session/session-viewer.service.ts b/frontend/src/app/sessions/session/session-viewer.service.ts
@@ -61,11 +61,18 @@ export class SessionViewerService {
           ),
         )
         .subscribe((session) => {
-          this.sessionsService
-            .getSessionConnectionInformation(session.id)
-            .subscribe((connectionInfo) => {
-              this._connectToSession(session, connectionInfo.payload);
-            });
+          if (
+            this.sessionService.beautifyState(
+              session.preparation_state,
+              session.state,
+            ).success
+          ) {
+            this.sessionsService
+              .getSessionConnectionInformation(session.id)
+              .subscribe((connectionInfo) => {
+                this._connectToSession(session, connectionInfo.payload);
+              });
+          }
         }),
     );
   }
@@ -85,7 +92,11 @@ export class SessionViewerService {
     }
 
     this.sessionService.setConnectionInformation(connectionInfo);
-    viewerSession.focused = false;
+    if (!this._sessions.value?.length) {
+      viewerSession.focused = true;
+    } else {
+      viewerSession.focused = false;
+    }
     viewerSession.safeResourceURL =
       this.domSanitizer.bypassSecurityTrustResourceUrl(
         connectionInfo.redirect_url,