From 04a300ac19cd07b4323e546f9dd08b36870caecc Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Fri, 20 May 2022 14:23:06 -0500
Subject: [PATCH 1/2] feat: add terminal links

---
 site/src/components/Resources/Resources.tsx | 17 ++++++++++++++---
 site/src/components/Workspace/Workspace.tsx |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/site/src/components/Resources/Resources.tsx b/site/src/components/Resources/Resources.tsx
index 25448c678bc81..c5145d5e49391 100644
--- a/site/src/components/Resources/Resources.tsx
+++ b/site/src/components/Resources/Resources.tsx
@@ -6,9 +6,10 @@ import TableHead from "@material-ui/core/TableHead"
 import TableRow from "@material-ui/core/TableRow"
 import useTheme from "@material-ui/styles/useTheme"
 import React from "react"
-import { WorkspaceResource } from "../../api/typesGenerated"
+import { Workspace, WorkspaceResource } from "../../api/typesGenerated"
 import { getDisplayAgentStatus } from "../../util/workspace"
 import { TableHeaderRow } from "../TableHeaders/TableHeaders"
+import { TerminalLink } from "../TerminalLink/TerminalLink"
 import { WorkspaceSection } from "../WorkspaceSection/WorkspaceSection"
 
 const Language = {
@@ -17,14 +18,16 @@ const Language = {
   agentsLabel: "Agents",
   agentLabel: "Agent",
   statusLabel: "Status",
+  accessLabel: "Access",
 }
 
 interface ResourcesProps {
   resources?: WorkspaceResource[]
   getResourcesError?: Error
+  workspace: Workspace
 }
 
-export const Resources: React.FC<ResourcesProps> = ({ resources, getResourcesError }) => {
+export const Resources: React.FC<ResourcesProps> = ({ resources, getResourcesError, workspace }) => {
   const styles = useStyles()
   const theme: Theme = useTheme()
 
@@ -39,6 +42,7 @@ export const Resources: React.FC<ResourcesProps> = ({ resources, getResourcesErr
               <TableCell>{Language.resourceLabel}</TableCell>
               <TableCell className={styles.agentColumn}>{Language.agentLabel}</TableCell>
               <TableCell>{Language.statusLabel}</TableCell>
+              <TableCell>{Language.accessLabel}</TableCell>
             </TableHeaderRow>
           </TableHead>
           <TableBody>
@@ -55,7 +59,7 @@ export const Resources: React.FC<ResourcesProps> = ({ resources, getResourcesErr
                   return (
                     <TableRow>
                       <TableCell className={styles.resourceNameCell}>{resource.name}</TableCell>
-                      <TableCell colSpan={2}></TableCell>
+                      <TableCell colSpan={3}></TableCell>
                     </TableRow>
                   )
                 }
@@ -78,6 +82,13 @@ export const Resources: React.FC<ResourcesProps> = ({ resources, getResourcesErr
                         {getDisplayAgentStatus(theme, agent).status}
                       </span>
                     </TableCell>
+                    <TableCell>
+                      <TerminalLink
+                        workspaceName={workspace.name}
+                        agentName={agent.name}
+                        userName={workspace.owner_name}
+                      />
+                    </TableCell>
                   </TableRow>
                 )
               })
diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
index 60e9ef7d3f5e6..d20061b9793af 100644
--- a/site/src/components/Workspace/Workspace.tsx
+++ b/site/src/components/Workspace/Workspace.tsx
@@ -68,7 +68,7 @@ export const Workspace: React.FC<WorkspaceProps> = ({
       <Stack direction="row" spacing={3} className={styles.layout}>
         <Stack spacing={3} className={styles.main}>
           <WorkspaceStats workspace={workspace} />
-          <Resources resources={resources} getResourcesError={getResourcesError} />
+          <Resources resources={resources} getResourcesError={getResourcesError} workspace={workspace} />
           <WorkspaceSection title="Timeline" contentsProps={{ className: styles.timelineContents }}>
             <BuildsTable builds={builds} className={styles.timelineTable} />
           </WorkspaceSection>

From 8a31fe99ecb69e92d30f42c8527eeccf1a4b13fc Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Fri, 20 May 2022 14:56:41 -0500
Subject: [PATCH 2/2] Only show terminal link when agent is connected

---
 site/src/components/Resources/Resources.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/site/src/components/Resources/Resources.tsx b/site/src/components/Resources/Resources.tsx
index c5145d5e49391..109020a002907 100644
--- a/site/src/components/Resources/Resources.tsx
+++ b/site/src/components/Resources/Resources.tsx
@@ -83,11 +83,13 @@ export const Resources: React.FC<ResourcesProps> = ({ resources, getResourcesErr
                       </span>
                     </TableCell>
                     <TableCell>
-                      <TerminalLink
-                        workspaceName={workspace.name}
-                        agentName={agent.name}
-                        userName={workspace.owner_name}
-                      />
+                      {agent.status === "connected" && (
+                        <TerminalLink
+                          workspaceName={workspace.name}
+                          agentName={agent.name}
+                          userName={workspace.owner_name}
+                        />
+                      )}
                     </TableCell>
                   </TableRow>
                 )