Complete frontend

ammario · ammario · commit b965dc3d32e7 · 2022-09-24T19:14:17.000Z
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -509,6 +509,7 @@ export interface User {
   readonly username: string
   readonly email: string
   readonly created_at: string
+  readonly last_seen_at: string
   readonly status: UserStatus
   readonly organization_ids: string[]
   readonly roles: Role[]
diff --git a/site/src/components/LastUsed/LastUsed.tsx b/site/src/components/LastUsed/LastUsed.tsx
@@ -8,11 +8,11 @@ import { colors } from "theme/colors"
 
 dayjs.extend(relativeTime)
 
-interface WorkspaceLastUsedProps {
+interface LastUsedProps {
   lastUsedAt: string
 }
 
-export const WorkspaceLastUsed: FC<WorkspaceLastUsedProps> = ({ lastUsedAt }) => {
+export const LastUsed: FC<LastUsedProps> = ({ lastUsedAt }) => {
   const theme: Theme = useTheme()
   const styles = useStyles()
 
diff --git a/site/src/components/UsersTable/UsersTable.tsx b/site/src/components/UsersTable/UsersTable.tsx
@@ -14,6 +14,7 @@ export const Language = {
   usernameLabel: "User",
   rolesLabel: "Roles",
   statusLabel: "Status",
+  lastSeenLabel: "Last Seen",
 }
 
 export interface UsersTableProps {
@@ -50,6 +51,7 @@ export const UsersTable: FC<React.PropsWithChildren<UsersTableProps>> = ({
           <TableRow>
             <TableCell width="50%">{Language.usernameLabel}</TableCell>
             <TableCell width="25%">{Language.statusLabel}</TableCell>
+            <TableCell width="50%">{Language.lastSeenLabel}</TableCell>
             <TableCell width="25%">
               <Stack direction="row" spacing={1} alignItems="center">
                 <span>{Language.rolesLabel}</span>
diff --git a/site/src/components/UsersTable/UsersTableBody.tsx b/site/src/components/UsersTable/UsersTableBody.tsx
@@ -2,6 +2,7 @@ import Box from "@material-ui/core/Box"
 import { makeStyles } from "@material-ui/core/styles"
 import TableCell from "@material-ui/core/TableCell"
 import TableRow from "@material-ui/core/TableRow"
+import { LastUsed } from "components/LastUsed/LastUsed"
 import { FC } from "react"
 import * as TypesGen from "../../api/typesGenerated"
 import { combineClasses } from "../../util/combineClasses"
@@ -101,6 +102,9 @@ export const UsersTableBody: FC<React.PropsWithChildren<UsersTableBodyProps>> =
             >
               {user.status}
             </TableCell>
+            <TableCell>
+              <LastUsed lastUsedAt={user.last_seen_at} />
+            </TableCell>
             <TableCell>
               {canEditUsers ? (
                 <RoleSelect
diff --git a/site/src/components/WorkspacesTable/WorkspacesRow.tsx b/site/src/components/WorkspacesTable/WorkspacesRow.tsx
@@ -8,10 +8,10 @@ import { WorkspaceStatusBadge } from "components/WorkspaceStatusBadge/WorkspaceS
 import { FC } from "react"
 import { useNavigate } from "react-router-dom"
 import { WorkspaceItemMachineRef } from "../../xServices/workspaces/workspacesXService"
+import { LastUsed } from "../LastUsed/LastUsed"
 import { TableCellData, TableCellDataPrimary } from "../TableCellData/TableCellData"
 import { TableCellLink } from "../TableCellLink/TableCellLink"
 import { OutdatedHelpTooltip } from "../Tooltips"
-import { WorkspaceLastUsed } from "./WorkspaceLastUsed"
 
 const Language = {
   upToDateLabel: "Up to date",
@@ -61,7 +61,7 @@ export const WorkspacesRow: FC<
       </TableCellLink>
       <TableCellLink to={workspacePageLink}>
         <TableCellData>
-          <WorkspaceLastUsed lastUsedAt={workspace.last_used_at} />
+          <LastUsed lastUsedAt={workspace.last_used_at} />
         </TableCellData>
       </TableCellLink>
 
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -71,6 +71,7 @@ export const MockUser: TypesGen.User = {
   organization_ids: ["fc0774ce-cc9e-48d4-80ae-88f7a4d4a8b0"],
   roles: [MockOwnerRole],
   avatar_url: "https://github.com/coder.png",
+  last_seen_at: "",
 }
 
 export const MockUserAdmin: TypesGen.User = {
@@ -82,6 +83,7 @@ export const MockUserAdmin: TypesGen.User = {
   organization_ids: ["fc0774ce-cc9e-48d4-80ae-88f7a4d4a8b0"],
   roles: [MockUserAdminRole],
   avatar_url: "",
+  last_seen_at: "",
 }
 
 export const MockUser2: TypesGen.User = {
@@ -93,6 +95,7 @@ export const MockUser2: TypesGen.User = {
   organization_ids: ["fc0774ce-cc9e-48d4-80ae-88f7a4d4a8b0"],
   roles: [],
   avatar_url: "",
+  last_seen_at: "2022-09-14T19:12:21Z",
 }
 
 export const SuspendedMockUser: TypesGen.User = {
@@ -104,6 +107,7 @@ export const SuspendedMockUser: TypesGen.User = {
   organization_ids: ["fc0774ce-cc9e-48d4-80ae-88f7a4d4a8b0"],
   roles: [],
   avatar_url: "",
+  last_seen_at: "",
 }
 
 export const MockOrganization: TypesGen.Organization = {
