Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix#8912: clear SSH service messages not working #8918

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Fix#8912: clear SSH service messages not working #8918

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cde5c0
fix(terminal) Eugeny/tabby#8912: move frontend clear after session in…
Clem-Fern Sep 2, 2023
04b53ab
ref(terminal) 7cde5c08075da0e5cf9e244c95b5c32791da6193: clear service…
Clem-Fern Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions tabby-terminal/src/api/connectableTerminalTab.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ export abstract class ConnectableTerminalTabComponent<P extends ConnectableTermi
}

protected onFrontendReady (): void {
this.initializeSession()
this.initializeSession().then(() => {
this.clearServiceMessagesOnConnect()
})
super.onFrontendReady()
}

Expand All @@ -57,9 +59,6 @@ export abstract class ConnectableTerminalTabComponent<P extends ConnectableTermi
async initializeSession (): Promise<void> {
this.reconnectOffered = false
this.isDisconnectedByHand = false
if (this.profile.clearServiceMessagesOnConnect) {
this.frontend?.clear()
}
}

/**
Expand Down Expand Up @@ -119,7 +118,14 @@ export abstract class ConnectableTerminalTabComponent<P extends ConnectableTermi
async reconnect (): Promise<void> {
this.session?.destroy()
await this.initializeSession()
this.clearServiceMessagesOnConnect()
this.session?.releaseInitialDataBuffer()
}

private clearServiceMessagesOnConnect (): void {
if (this.profile.clearServiceMessagesOnConnect && this.session?.open) {
this.frontend?.clear()
}
}

}