address CR comments

AbhineetJain · AbhineetJain · commit 08d1c347ffec · 2022-06-09T20:37:12.000Z
diff --git a/site/src/components/Resources/Resources.tsx b/site/src/components/Resources/Resources.tsx
@@ -131,27 +131,24 @@ export const Resources: FC<ResourcesProps> = ({ resources, getResourcesError, wo
                       {agent.name}
                       <span className={styles.operatingSystem}>{agent.operating_system}</span>
                     </TableCell>
-                    {canUpdateWorkspace && (
+                    {canUpdateWorkspace && agent.status === "connected" && (
                       <TableCell>
                         <Stack>
-                          {agent.status === "connected" && (
-                            <TerminalLink
-                              className={styles.accessLink}
-                              workspaceName={workspace.name}
-                              agentName={agent.name}
+                          <TerminalLink
+                            className={styles.accessLink}
+                            workspaceName={workspace.name}
+                            agentName={agent.name}
+                            userName={workspace.owner_name}
+                          />
+                          {agent.apps.map((app) => (
+                            <AppLink
+                              key={app.name}
+                              appIcon={app.icon}
+                              appName={app.name}
                               userName={workspace.owner_name}
+                              workspaceName={workspace.name}
                             />
-                          )}
-                          {agent.status === "connected" &&
-                            agent.apps.map((app) => (
-                              <AppLink
-                                key={app.name}
-                                appIcon={app.icon}
-                                appName={app.name}
-                                userName={workspace.owner_name}
-                                workspaceName={workspace.name}
-                              />
-                            ))}
+                          ))}
                         </Stack>
                       </TableCell>
                     )}
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -21,7 +21,12 @@ export const WorkspacePage: React.FC = () => {
   const xServices = useContext(XServiceContext)
   const me = useSelector(xServices.authXService, selectUser)
 
-  const [workspaceState, workspaceSend] = useMachine(workspaceMachine.withContext({ userId: me?.id }))
+  const [workspaceState, workspaceSend] = useMachine(
+    workspaceMachine.withContext({
+      ...workspaceMachine.initialState.context,
+      userId: me?.id,
+    }),
+  )
   const { workspace, resources, getWorkspaceError, getResourcesError, builds, permissions } = workspaceState.context
 
   const canUpdateWorkspace = !!permissions?.updateWorkspace
diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -28,14 +28,14 @@ export interface WorkspaceContext {
   // error creating a new WorkspaceBuild
   buildError?: Error | unknown
   // these are separate from getX errors because they don't make the page unusable
-  refreshWorkspaceError?: Error | unknown
-  refreshTemplateError?: Error | unknown
-  getResourcesError?: Error | unknown
+  refreshWorkspaceError: Error | unknown
+  refreshTemplateError: Error | unknown
+  getResourcesError: Error | unknown
   // Builds
   builds?: TypesGen.WorkspaceBuild[]
   getBuildsError?: Error | unknown
   loadMoreBuildsError?: Error | unknown
-  cancellationMessage?: string
+  cancellationMessage: string
   // permissions
   permissions?: Permissions
   checkPermissionsError?: Error | unknown
@@ -411,7 +411,7 @@ export const workspaceMachine = createMachine(
           cancellationMessage: undefined,
         }),
       displayCancellationError: (context) => {
-        displayError(context.cancellationMessage || "Cancellation failed")
+        displayError(context.cancellationMessage)
       },
       assignRefreshWorkspaceError: (_, event) =>
         assign({
