feat: add user last seen field

app/controllers/admin_controller.ts

@@ -16,10 +16,9 @@ class UserWithRelationCountDto {
 		isAdmin: this.user.isAdmin,
 		createdAt: this.user.createdAt,
 		updatedAt: this.user.updatedAt,
-		count: {
+		lastSeenAt: this.user.lastSeenAt,
-			link: Number(this.user.$extras.totalLinks),
+		linksCount: Number(this.user.$extras.totalLinks),
-			collection: Number(this.user.$extras.totalCollections),
+		collectionsCount: Number(this.user.$extras.totalCollections),
-		},
 	});
 }
 

app/middleware/silent_auth_middleware.ts

@@ -0,0 +1,9 @@
+import type { HttpContext } from '@adonisjs/core/http';
+import type { NextFn } from '@adonisjs/core/types/http';
+
+export default class SilentAuthMiddleware {
+	async handle(ctx: HttpContext, next: NextFn) {
+		await ctx.auth.check();
+		return next();
+	}
+}

app/middleware/update_user_last_seen_middleware.ts

@@ -0,0 +1,16 @@
+import type { HttpContext } from '@adonisjs/core/http';
+import type { NextFn } from '@adonisjs/core/types/http';
+import { DateTime } from 'luxon';
+
+export default class UpdateUserLastSeenMiddleware {
+	async handle(ctx: HttpContext, next: NextFn) {
+		const user = ctx.auth.user;
+		if (user) {
+			user.lastSeenAt = DateTime.local();
+			await user.save();
+		}
+
+		const output = await next();
+		return output;
+	}
+}

app/models/user.ts

@@ -4,6 +4,7 @@ import type { GoogleToken } from '@adonisjs/ally/types';
 import { column, computed, hasMany } from '@adonisjs/lucid/orm';
 import type { HasMany } from '@adonisjs/lucid/types/relations';
 import AppBaseModel from './app_base_model.js';
+import { DateTime } from 'luxon';
 
 export default class User extends AppBaseModel {
 	@column()
@@ -44,4 +45,10 @@ export default class User extends AppBaseModel {
 	get fullname() {
 		return this.nickName || this.name;
 	}
+
+	@column.dateTime({
+		autoCreate: true,
+		autoUpdate: true,
+	})
+	declare lastSeenAt: DateTime;
 }

database/migrations/1728257868871_update_user_last_seens_table.ts

@@ -0,0 +1,15 @@
+import { BaseSchema } from '@adonisjs/lucid/schema';
+
+export default class extends BaseSchema {
+	protected tableName = 'users';
+
+	async up() {
+		this.schema.alterTable(this.tableName, (table) => {
+			table.timestamp('last_seen_at');
+		});
+	}
+
+	async down() {
+		this.schema.dropTable(this.tableName);
+	}
+}

inertia/components/common/table.tsx

@@ -6,6 +6,7 @@ import {
 	getPaginationRowModel,
 	getSortedRowModel,
 	PaginationState,
+	SortingState,
 	useReactTable,
 } from '@tanstack/react-table';
 import { useState } from 'react';
@@ -50,13 +51,19 @@ const Resizer = styled.div<{ isResizing: boolean }>(
 type TableProps<T> = {
 	columns: ColumnDef<T>[];
 	data: T[];
+	defaultSorting?: SortingState;
 };
 
-export default function Table<T>({ columns, data }: TableProps<T>) {
+export default function Table<T>({
+	columns,
+	data,
+	defaultSorting = [],
+}: TableProps<T>) {
 	const [pagination, setPagination] = useState<PaginationState>({
 		pageIndex: 0,
 		pageSize: 10,
 	});
+	const [sorting, setSorting] = useState<SortingState>(defaultSorting);
 
 	const table = useReactTable({
 		data,
@@ -65,11 +72,13 @@ export default function Table<T>({ columns, data }: TableProps<T>) {
 		columnResizeMode: 'onChange',
 		state: {
 			pagination,
+			sorting,
 		},
 		onPaginationChange: setPagination,
 		getCoreRowModel: getCoreRowModel(),
 		getPaginationRowModel: getPaginationRowModel(),
 		getSortedRowModel: getSortedRowModel(),
+		onSortingChange: setSorting,
 		debugTable: true,
 	});
 

inertia/i18n/locales/en/admin.json

@@ -1,7 +1,7 @@
 {
 	"role": "Role",
 	"created_at": "Created at",
-  "updated_at": "Updated at",
+	"last_seen_at": "Last seen at",
 	"admin": "Administrator",
 	"user": "User",
 	"users": "Users",

inertia/i18n/locales/fr/admin.json

@@ -1,7 +1,7 @@
 {
 	"role": "Rôle",
 	"created_at": "Création",
-  "updated_at": "Mise à jour",
+	"last_seen_at": "Dernière connexion",
 	"admin": "Administrateur",
 	"user": "Utilisateur",
 	"users": "Utilisateurs",

inertia/pages/admin/dashboard.tsx

@@ -51,7 +51,7 @@ function AdminDashboard({
 			[
 				{
 					accessorKey: 'id',
-					header: (
+					header: () => (
 						<>
 							# <span css={{ color: theme.colors.grey }}>({users.length})</span>
 						</>
@@ -69,8 +69,8 @@ function AdminDashboard({
 					cell: (info) => info.getValue(),
 				},
 				{
-					accessorKey: 'count',
+					accessorKey: 'collectionsCount',
-					header: (
+					header: () => (
 						<>
 							{t('common:collection.collections', { count: totalCollections })}{' '}
 							<span css={{ color: theme.colors.grey }}>
@@ -78,17 +78,17 @@ function AdminDashboard({
 							</span>
 						</>
 					),
-					cell: (info) => (info.getValue() as any)?.collection,
+					cell: (info) => info.getValue(),
 				},
 				{
-					accessorKey: 'count',
+					accessorKey: 'linksCount',
-					header: (
+					header: () => (
 						<>
 							{t('common:link.links', { count: totalLinks })}{' '}
 							<span css={{ color: theme.colors.grey }}>({totalLinks})</span>
 						</>
 					),
-					cell: (info: any) => info.getValue()?.link,
+					cell: (info: any) => info.getValue(),
 				},
 				{
 					accessorKey: 'isAdmin',
@@ -110,12 +110,23 @@ function AdminDashboard({
 					cell: RenderDateCell,
 				},
 				{
-					accessorKey: 'updatedAt',
+					accessorKey: 'lastSeenAt',
-					header: t('admin:updated_at'),
+					header: t('admin:last_seen_at'),
 					cell: RenderDateCell,
 				},
-			] as ColumnDef<UserWithRelationCount>[],
+			] satisfies ColumnDef<UserWithRelationCount>[],
 		[]
 	);
-	return <Table columns={columns} data={users} />;
+	return (
+		<Table
+			columns={columns}
+			data={users}
+			defaultSorting={[
+				{
+					id: 'lastSeenAt',
+					desc: true,
+				},
+			]}
+		/>
+	);
 }

inertia/types/app.d.ts

@@ -24,10 +24,9 @@ type UserWithRelationCount = CommonBase & {
 	fullname: string;
 	avatarUrl: string;
 	isAdmin: string;
-	count: {
+	linksCount: number;
-		link: number;
+	collectionsCount: number;
-		collection: number;
+	lastSeenAt: string;
-	};
 };
 
 type Link = CommonBase & {

start/kernel.ts

@@ -41,6 +41,8 @@ router.use([
 	() => import('@adonisjs/session/session_middleware'),
 	() => import('@adonisjs/shield/shield_middleware'),
 	() => import('@adonisjs/auth/initialize_auth_middleware'),
+	() => import('#middleware/silent_auth_middleware'),
+	() => import('#middleware/update_user_last_seen_middleware'),
 ]);
 
 /**