From 3fb1096373d4d87576333f2f58137fa16e27d06e Mon Sep 17 00:00:00 2001 From: cowsed Date: Tue, 7 Jul 2026 14:52:26 -0400 Subject: [PATCH 1/3] device page search case-insensitively --- client/src/pages/makerspace_page/device_pages/DevicesPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ( From 852ab09d8b4fa4754b0743306af52f214d03f74b Mon Sep 17 00:00:00 2001 From: cowsed Date: Tue, 7 Jul 2026 14:58:32 -0400 Subject: [PATCH 2/3] include machine in maintenance ticket log so you can go right there --- server/src/graphql/resolvers/maintenanceTicketResolver.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/graphql/resolvers/maintenanceTicketResolver.ts b/server/src/graphql/resolvers/maintenanceTicketResolver.ts index 94f246d3..3736ec7f 100644 --- a/server/src/graphql/resolvers/maintenanceTicketResolver.ts +++ b/server/src/graphql/resolvers/maintenanceTicketResolver.ts @@ -165,10 +165,11 @@ 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 { From 15d9c36b212887d3f6ef0f9a1467509ddedb17b9 Mon Sep 17 00:00:00 2001 From: cowsed Date: Tue, 7 Jul 2026 15:00:14 -0400 Subject: [PATCH 3/3] include machine in maintenance ticket un-assignment --- server/src/graphql/resolvers/maintenanceTicketResolver.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/graphql/resolvers/maintenanceTicketResolver.ts b/server/src/graphql/resolvers/maintenanceTicketResolver.ts index 3736ec7f..04ae8262 100644 --- a/server/src/graphql/resolvers/maintenanceTicketResolver.ts +++ b/server/src/graphql/resolvers/maintenanceTicketResolver.ts @@ -174,10 +174,11 @@ const MaintenanceTicketResolver = { ); } 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" } ); } }),