From c1752f41e07df33228a7d92e031b2b88e7c271dc Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Mon, 11 Jan 2021 16:26:33 -0400 Subject: [PATCH] Improved search --- server/src/resolvers/Query/userPresence.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/resolvers/Query/userPresence.js b/server/src/resolvers/Query/userPresence.js index 8f11f79..ca8b9c5 100644 --- a/server/src/resolvers/Query/userPresence.js +++ b/server/src/resolvers/Query/userPresence.js @@ -15,11 +15,11 @@ export async function userPresence(_, { search }) { const filteredUsers = search ? usersWithWifiDevices.filter( user => - user.displayName?.toLowerCase().includes(search) || - user.sAMAccountName.toLowerCase().includes(search) || - user.title?.toLowerCase().includes(search) || - user.department?.toLowerCase().includes(search) || - user.description?.toLowerCase().includes(search) || + Object.keys(user).some(key => + typeof user[key] == 'string' + ? user[key].toLowerCase().includes(search) + : false + ) || user.wifiDevices?.some( device => device.ip?.startsWith(search) ||