From 7bff1a37ca31004c831fe31ad196857a42a29024 Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Thu, 6 Jul 2023 16:57:50 -0700
Subject: [PATCH] Show user's last activity

---
 src/lib/helpers/date.ts                                | 10 ++++++++++
 src/routes/console/project-[project]/auth/+page.svelte |  4 ++++
 .../auth/user-[user]/dangerZone.svelte                 |  2 ++
 .../auth/user-[user]/updateStatus.svelte               |  1 +
 tests/unit/helpers/date.test.ts                        |  8 ++++++++
 5 files changed, 25 insertions(+)

diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts
index 8558f315fa..68f9c31a75 100644
--- a/src/lib/helpers/date.ts
+++ b/src/lib/helpers/date.ts
@@ -1,5 +1,10 @@
 export const toLocaleDate = (datetime: string) => {
     const date = new Date(datetime);
+
+    if (isNaN(date.getTime())) {
+        return 'n/a';
+    }
+
     const options: Intl.DateTimeFormatOptions = {
         year: 'numeric',
         month: 'short',
@@ -11,6 +16,11 @@ export const toLocaleDate = (datetime: string) => {
 
 export const toLocaleDateTime = (datetime: string | number) => {
     const date = new Date(datetime);
+
+    if (isNaN(date.getTime())) {
+        return 'n/a';
+    }
+
     const options: Intl.DateTimeFormatOptions = {
         year: 'numeric',
         month: 'short',
diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte
index 0063f7ea1f..dcb5f09b41 100644
--- a/src/routes/console/project-[project]/auth/+page.svelte
+++ b/src/routes/console/project-[project]/auth/+page.svelte
@@ -50,6 +50,7 @@
                 <TableCellHead onlyDesktop width={130}>Status</TableCellHead>
                 <TableCellHead onlyDesktop width={100}>ID</TableCellHead>
                 <TableCellHead onlyDesktop>Joined</TableCellHead>
+                <TableCellHead onlyDesktop>Last Activity</TableCellHead>
             </TableHeader>
             <TableBody>
                 {#each data.users.users as user}
@@ -105,6 +106,9 @@
                         <TableCellText onlyDesktop title="Joined">
                             {toLocaleDateTime(user.registration)}
                         </TableCellText>
+                        <TableCellText onlyDesktop title="Last Activity">
+                            {toLocaleDateTime(user.accessedAt)}
+                        </TableCellText>
                     </TableRowLink>
                 {/each}
             </TableBody>
diff --git a/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte b/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte
index 8fa2ff05d3..f7ccddf7a3 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { CardGrid, Box, Heading, AvatarInitials } from '$lib/components';
     import { Button } from '$lib/elements/forms';
+    import { toLocaleDateTime } from '$lib/helpers/date';
     import DeleteUser from './deleteUser.svelte';
     import { user } from './store';
 
@@ -42,6 +43,7 @@
                     ? [$user.email, $user.phone].join(',')
                     : $user.email || $user.phone}
             </p>
+            <p>Last activity: {toLocaleDateTime($user.accessedAt)}</p>
         </Box>
     </svelte:fragment>
 
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
index 60a2189d18..04c70ad672 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
@@ -100,6 +100,7 @@
                     <p class="title">{$user.phone}</p>
                 {/if}
                 <p>Joined: {toLocaleDateTime($user.registration)}</p>
+                <p>Last activity: {toLocaleDateTime($user.accessedAt)}</p>
             </div>
             {#if !$user.status}
                 <Pill danger>blocked</Pill>
diff --git a/tests/unit/helpers/date.test.ts b/tests/unit/helpers/date.test.ts
index 16b5ff3f4d..fab13619a3 100644
--- a/tests/unit/helpers/date.test.ts
+++ b/tests/unit/helpers/date.test.ts
@@ -16,6 +16,10 @@ describe('local date', () => {
             expect(toLocaleDate(value)).toBe(expected);
         });
     });
+
+    it('invalid date', () => {
+        expect(toLocaleDate('')).toBe('n/a');
+    });
 });
 
 describe('local date time', () => {
@@ -27,6 +31,10 @@ describe('local date time', () => {
             expect(toLocaleDateTime(value)).toBe(expected);
         });
     });
+
+    it('invalid date', () => {
+        expect(toLocaleDateTime('')).toBe('n/a');
+    });
 });
 
 describe('is same day', () => {