Merge branch 'NAS-133545' of github.com:truenas/webui into NAS-133545

truenas · Jan 14, 2025 · 2345a76 · 2345a76
2 parents 088d086 + 749e37f
commit 2345a76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/app/modules/loader/app-loader.service.ts b/src/app/modules/loader/app-loader.service.ts
@@ -9,7 +9,7 @@ import { FocusService } from 'app/services/focus.service';
 
 @Injectable({ providedIn: 'root' })
 export class AppLoaderService {
-  dialogRef: MatDialogRef<AppLoaderComponent> | null;
+  dialogRef: MatDialogRef<AppLoaderComponent> | null = null;
 
   constructor(
     private matDialog: MatDialog,

diff --git a/src/app/modules/terminal/components/terminal/terminal.component.ts b/src/app/modules/terminal/components/terminal/terminal.component.ts
@@ -188,7 +188,7 @@ export class TerminalComponent implements OnInit, OnDestroy {
     this.xterm.options.fontSize = this.fontSize;
     this.fitAddon.fit();
     const size = this.fitAddon.proposeDimensions();
-    if (size) {
+    if (size && this.connectionId) {
       this.api.call('core.resize_shell', [this.connectionId, size.cols, size.rows]).pipe(untilDestroyed(this)).subscribe(() => {
         this.xterm.focus();
       });
@@ -200,12 +200,14 @@ export class TerminalComponent implements OnInit, OnDestroy {
   initializeWebShell(): void {
     this.shellService.connect(this.token, this.conf().connectionData);
 
-    this.shellService.shellConnected$.pipe(untilDestroyed(this)).subscribe((event: ShellConnectedEvent) => {
-      this.shellConnected = event.connected;
-      this.connectionId = event.id;
-      this.updateTerminal();
-      this.resizeTerm();
-    });
+    this.shellService.shellConnected$
+      .pipe(filter(Boolean), untilDestroyed(this))
+      .subscribe((event: ShellConnectedEvent) => {
+        this.shellConnected = event.connected;
+        this.connectionId = event.id;
+        this.updateTerminal();
+        this.resizeTerm();
+      });
   }
 
   resetDefault(): void {