Move agent status

presleyp · presleyp · commit 99e9cff6920a · 2022-06-22T19:25:20.000Z
diff --git 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 */}
@@ -90,12 +89,16 @@ export const Resources: FC<ResourcesProps> = ({ resources, getResourcesError, wo
                       <TableCell className={styles.resourceNameCell} rowSpan={agents.length}>
                         {resource.name}
                         <span className={styles.resourceType}>{resource.type}</span>
+
                       </TableCell>
                     )}
 
                     <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 +124,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>
                 )
               })
