Commite7ebcb5

authored

fix: use workspace name when opening links via the terminal (#6077)

This was using the `<workspace>.<agent>` syntax before, which was invalid.

1 parentc82e38e commite7ebcb5Copy full SHA for e7ebcb5

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ const TerminalPage: FC<`
`56`	`56`	`>=({ renderer})=>{`
`57`	`57`	`constnavigate=useNavigate()`
`58`	`58`	`conststyles=useStyles()`
`59`		`-const{ username, workspace}=useParams()`
	`59`	`+const{ username,workspace:workspaceName}=useParams()`
`60`	`60`	`constxtermRef=useRef<HTMLDivElement>(null)`
`61`	`61`	`const[terminal,setTerminal]=useState<XTerm.Terminal\|null>(null)`
`62`	`62`	`const[fitAddon,setFitAddon]=useState<FitAddon\|null>(null)`
`@@ -68,7 +68,7 @@ const TerminalPage: FC<`
`68`	`68`	`constcommand=searchParams.get("command")\|\|undefined`
`69`	`69`	`// The workspace name is in the format:`
`70`	`70`	`// <workspace name>[.<agent name>]`
`71`		`-constworkspaceNameParts=workspace?.split(".")`
	`71`	`+constworkspaceNameParts=workspaceName?.split(".")`
`72`	`72`	`const[terminalState,sendEvent]=useMachine(terminalMachine,{`
`73`	`73`	`context:{`
`74`	`74`	`agentName:workspaceNameParts?.[1],`
`@@ -93,6 +93,7 @@ const TerminalPage: FC<`
`93`	`93`	`constisDisconnected=terminalState.matches("disconnected")`
`94`	`94`	`const{`
`95`	`95`	`workspaceError,`
	`96`	`+ workspace,`
`96`	`97`	`workspaceAgentError,`
`97`	`98`	`workspaceAgent,`
`98`	`99`	`websocketError,`
`@@ -134,9 +135,9 @@ const TerminalPage: FC<`
`134`	`135`	`applicationsHost,`
`135`	`136`	`parseInt(url.port),`
`136`	`137`	`workspaceAgent.name,`
`137`		`-workspace,`
	`138`	`+workspace.name,`
`138`	`139`	`username,`
`139`		`-),`
	`140`	`+)+url.pathname,`
`140`	`141`	`)`
`141`	`142`	`}catch(ex){`
`142`	`143`	`open(uri)`

Comments

(0)