Skip to content

chore(site): remove terminal xservice #10234

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

Merged
merged 8 commits into from
Oct 20, 2023
Merged

chore(site): remove terminal xservice #10234

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab24515
Break out getting agent name
code-asher Oct 12, 2023
1b99882
Break out getting terminal websocket url
code-asher Oct 12, 2023
2d4b8f9
Remove terminalXService
code-asher Oct 12, 2023
81a7e57
Fix hanging tests
code-asher Oct 12, 2023
a38737b
Ignore other config changes
code-asher Oct 19, 2023
e779917
Break out port forward URL open to util
code-asher Oct 19, 2023
15d3f58
Prevent handleWebLink change from recreating terminal
code-asher Oct 19, 2023
c9a20d9
Add comments on the problem with ws.connected
code-asher Oct 20, 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
Prev Previous commit
Next Next commit
Prevent handleWebLink change from recreating terminal 
Depending on the timing, handleWebLink was causing the terminal to get
recreated.  We only need to create the terminal once unless the render
type changes.

Recreating the terminal was also recreating the web socket pointlessly.
  • Loading branch information
@code-asher
code-asher committed Oct 19, 2023
commit 15d3f5825dfa91725175790020d6754ddd85e9d7
8 changes: 6 additions & 2 deletions site/src/pages/TerminalPage/TerminalPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ const TerminalPage: FC = () => {
},
[workspaceAgent, workspace.data, username, proxy.preferredWildcardHostname],
);
const handleWebLinkRef = useRef(handleWebLink);
useEffect(() => {
handleWebLinkRef.current = handleWebLink;
}, [handleWebLink]);

// Create the terminal!
useEffect(() => {
Expand Down Expand Up @@ -127,7 +131,7 @@ const TerminalPage: FC = () => {
terminal.unicode.activeVersion = "11";
terminal.loadAddon(
new WebLinksAddon((_, uri) => {
handleWebLink(uri);
handleWebLinkRef.current(uri);
}),
);
setTerminal(terminal);
Expand All @@ -141,7 +145,7 @@ const TerminalPage: FC = () => {
window.removeEventListener("resize", listener);
terminal.dispose();
};
}, [renderer, config.isLoading, xtermRef, handleWebLink]);
}, [renderer, config.isLoading, xtermRef, handleWebLinkRef]);

// Updates the reconnection token into the URL if necessary.
useEffect(() => {
Expand Down