From 65870e65ceadecda1f856b2bd84f4dc6bec90330 Mon Sep 17 00:00:00 2001
From: Presley Pizzo <1290996+presleyp@users.noreply.github.com>
Date: Thu, 23 Jun 2022 10:18:56 -0400
Subject: [PATCH] feat: Move agent status (#2593)

* Move agent status

* Format
---
 site/src/components/Resources/Resources.tsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/site/src/components/Resources/Resources.tsx b/site/src/components/Resources/Resources.tsx
index 7944323eb4..a32a2d082a 100644
--- a/site/src/components/Resources/Resources.tsx
+++ b/site/src/components/Resources/Resources.tsx
@@ -21,7 +21,6 @@ const Language = {
   resourceLabel: "Resource",
   agentsLabel: "Agents",
   agentLabel: "Agent",
-  statusLabel: "Status",
   accessLabel: "Access",
 }
 
@@ -57,7 +56,6 @@ export const Resources: FC<ResourcesProps> = ({ resources, getResourcesError, wo
                 </Stack>
               </TableCell>
               {canUpdateWorkspace && <TableCell>{Language.accessLabel}</TableCell>}
-              <TableCell>{Language.statusLabel}</TableCell>
             </TableHeaderRow>
           </TableHead>
           <TableBody>
@@ -82,6 +80,7 @@ export const Resources: FC<ResourcesProps> = ({ resources, getResourcesError, wo
                   )
                 }
 
+                const agentStatus = getDisplayAgentStatus(theme, agent)
                 return (
                   <TableRow key={`${resource.id}-${agent.id}`}>
                     {/* We only want to display the name in the first row because we are using rowSpan */}
@@ -96,6 +95,7 @@ export const Resources: FC<ResourcesProps> = ({ resources, getResourcesError, wo
                     <TableCell className={styles.agentColumn}>
                       {agent.name}
                       <span className={styles.operatingSystem}>{agent.operating_system}</span>
+                      <span style={{ color: agentStatus.color }}>{agentStatus.status}</span>
                     </TableCell>
                     {canUpdateWorkspace && (
                       <TableCell>
@@ -121,11 +121,6 @@ export const Resources: FC<ResourcesProps> = ({ resources, getResourcesError, wo
                         </Stack>
                       </TableCell>
                     )}
-                    <TableCell>
-                      <span style={{ color: getDisplayAgentStatus(theme, agent).color }}>
-                        {getDisplayAgentStatus(theme, agent).status}
-                      </span>
-                    </TableCell>
                   </TableRow>
                 )
               })