From 9392820a8006b0df60130ba0ccd7b9961bdcb956 Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@carberry.com>
Date: Tue, 7 Feb 2023 14:35:44 +0000
Subject: [PATCH] fix: use workspace name when opening links via the terminal

This was using the `<workspace>.<agent>` syntax before, which was invalid.
---
 site/src/pages/TerminalPage/TerminalPage.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/src/pages/TerminalPage/TerminalPage.tsx b/site/src/pages/TerminalPage/TerminalPage.tsx
index 908e5b7407413..16c1a008c302d 100644
--- a/site/src/pages/TerminalPage/TerminalPage.tsx
+++ b/site/src/pages/TerminalPage/TerminalPage.tsx
@@ -56,7 +56,7 @@ const TerminalPage: FC<
 > = ({ renderer }) => {
   const navigate = useNavigate()
   const styles = useStyles()
-  const { username, workspace } = useParams()
+  const { username, workspace: workspaceName } = useParams()
   const xtermRef = useRef<HTMLDivElement>(null)
   const [terminal, setTerminal] = useState<XTerm.Terminal | null>(null)
   const [fitAddon, setFitAddon] = useState<FitAddon | null>(null)
@@ -68,7 +68,7 @@ const TerminalPage: FC<
   const command = searchParams.get("command") || undefined
   // The workspace name is in the format:
   // <workspace name>[.<agent name>]
-  const workspaceNameParts = workspace?.split(".")
+  const workspaceNameParts = workspaceName?.split(".")
   const [terminalState, sendEvent] = useMachine(terminalMachine, {
     context: {
       agentName: workspaceNameParts?.[1],
@@ -93,6 +93,7 @@ const TerminalPage: FC<
   const isDisconnected = terminalState.matches("disconnected")
   const {
     workspaceError,
+    workspace,
     workspaceAgentError,
     workspaceAgent,
     websocketError,
@@ -134,9 +135,9 @@ const TerminalPage: FC<
             applicationsHost,
             parseInt(url.port),
             workspaceAgent.name,
-            workspace,
+            workspace.name,
             username,
-          ),
+          ) + url.pathname,
         )
       } catch (ex) {
         open(uri)