Fix local storage load

Emyrk · Emyrk · commit 89efc57464de · 2023-04-27T09:47:31.000-05:00
diff --git a/site/src/components/TerminalLink/TerminalLink.tsx b/site/src/components/TerminalLink/TerminalLink.tsx
@@ -28,11 +28,10 @@ export const TerminalLink: FC<React.PropsWithChildren<TerminalLinkProps>> = ({
   userName = "me",
   workspaceName,
 }) => {
-  const { proxy } = useProxy()
 
-  const href = `${proxy.preferredPathAppURL}/@${userName}/${workspaceName}${
-    agentName ? `.${agentName}` : ""
-  }/terminal`
+  // Always use the primary for the terminal link. This is a relative link. 
+  const href = `/@${userName}/${workspaceName}${agentName ? `.${agentName}` : ""
+    }/terminal`
 
   return (
     <Link
diff --git a/site/src/contexts/ProxyContext.tsx b/site/src/contexts/ProxyContext.tsx
@@ -198,8 +198,8 @@ export const loadPreferredProxy = (): PreferredProxy | undefined => {
   if (str === undefined || str === null) {
     return undefined
   }
-  const proxy = JSON.parse(str)
-  if (proxy.id === undefined || proxy.id === null) {
+  const proxy: PreferredProxy = JSON.parse(str)
+  if (proxy.selectedRegion === undefined || proxy.selectedRegion === null) {
     return undefined
   }
   return proxy

Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,8 @@ export const loadPreferredProxy = (): PreferredProxy \| undefined => {`
`198`	`198`	`if (str === undefined \|\| str === null) {`
`199`	`199`	`return undefined`
`200`	`200`	`}`
`201`		`- const proxy = JSON.parse(str)`
`202`		`- if (proxy.id === undefined \|\| proxy.id === null) {`
	`201`	`+ const proxy: PreferredProxy = JSON.parse(str)`
	`202`	`+ if (proxy.selectedRegion === undefined \|\| proxy.selectedRegion === null) {`
`203`	`203`	`return undefined`
`204`	`204`	`}`
`205`	`205`	`return proxy`