diff --git a/client/src/pages/makerspace_page/device_pages/DevicesPage.tsx b/client/src/pages/makerspace_page/device_pages/DevicesPage.tsx index 87ca140b..09cb5641 100644 --- a/client/src/pages/makerspace_page/device_pages/DevicesPage.tsx +++ b/client/src/pages/makerspace_page/device_pages/DevicesPage.tsx @@ -38,7 +38,7 @@ export default function DevicesPage() { const cores: Core[] = makerspaceWithDevicesResult.data?.makerspaceByID.cores ?? []; const _dispensers: Dispenser[] = makerspaceWithDevicesResult.data?.makerspaceByID.dispensers ?? []; - const filteredCores: Core[] = cores.filter((core) => core.device.name.includes(searchText)) + const filteredCores: Core[] = cores.filter((core) => core.device.name.toLowerCase().includes(searchText.toLowerCase())) return ( diff --git a/server/src/graphql/resolvers/maintenanceTicketResolver.ts b/server/src/graphql/resolvers/maintenanceTicketResolver.ts index 94f246d3..04ae8262 100644 --- a/server/src/graphql/resolvers/maintenanceTicketResolver.ts +++ b/server/src/graphql/resolvers/maintenanceTicketResolver.ts @@ -165,18 +165,20 @@ const MaintenanceTicketResolver = { if (args.assignedID) { const assigned = await UserRepo.getUserByID(args.assignedID); await AuditLogRepo.createAuditLog( - `{user} assigned ticket #${args.id} to {user}`, + `{user} assigned ticket #${args.id} for {equipment} to {user}`, "admin", makerspaceID, { id: user.id, label: UserRepo.getUsersFullName(user) }, + { id: equipRow?.id ?? 0, label: equipRow?.name ?? "unknown equipment" }, { id: assigned.id, label: UserRepo.getUsersFullName(assigned) } ); } else { await AuditLogRepo.createAuditLog( - `{user} unassigned ticket #${args.id}`, + `{user} unassigned ticket #${args.id} for {equipment}`, "admin", makerspaceID, - { id: user.id, label: UserRepo.getUsersFullName(user) } + { id: user.id, label: UserRepo.getUsersFullName(user) }, + { id: equipRow?.id ?? 0, label: equipRow?.name ?? "unknown equipment" } ); } }),