Include hostname in search
This commit is contained in:
parent
eb3b0d71cc
commit
eebca1ba9a
|
@ -23,32 +23,27 @@ export async function userPresence(_, { search }) {
|
|||
device.status != 'OFFLINE' &&
|
||||
(device.ip?.startsWith(search) ||
|
||||
device.apName?.contains(search) ||
|
||||
device.essid?.contains(search))
|
||||
device.essid?.contains(search) ||
|
||||
device.hostname?.contains(search))
|
||||
)
|
||||
)
|
||||
: usersWithWifiDevices
|
||||
|
||||
// const sortedUsers = filteredUsers.sort((a, b) =>
|
||||
// a.wifiDevices[0].lastSeen > b.wifiDevices[0].lastSeen ? -1 : 1
|
||||
// )
|
||||
|
||||
const sortedUsers = filteredUsers.sort((a, b) => {
|
||||
const [aStatus, bStatus] = [
|
||||
a.wifiDevices[0].status,
|
||||
b.wifiDevices[0].status
|
||||
]
|
||||
if (
|
||||
(a.wifiDevices[0].status == 'ONLINE' &&
|
||||
b.wifiDevices[0].status == 'RECENT') ||
|
||||
(a.wifiDevices[0].status == 'ONLINE' &&
|
||||
b.wifiDevices[0].status == 'OFFLINE') ||
|
||||
(a.wifiDevices[0].status == 'RECENT' &&
|
||||
b.wifiDevices[0].status == 'OFFLINE')
|
||||
(aStatus == 'ONLINE' && bStatus == 'RECENT') ||
|
||||
(aStatus == 'ONLINE' && bStatus == 'OFFLINE') ||
|
||||
(aStatus == 'RECENT' && bStatus == 'OFFLINE')
|
||||
)
|
||||
return -1
|
||||
if (
|
||||
(b.wifiDevices[0].status == 'ONLINE' &&
|
||||
a.wifiDevices[0].status == 'RECENT') ||
|
||||
(b.wifiDevices[0].status == 'ONLINE' &&
|
||||
a.wifiDevices[0].status == 'OFFLINE') ||
|
||||
(b.wifiDevices[0].status == 'RECENT' &&
|
||||
a.wifiDevices[0].status == 'OFFLINE')
|
||||
(bStatus == 'ONLINE' && aStatus == 'RECENT') ||
|
||||
(bStatus == 'ONLINE' && aStatus == 'OFFLINE') ||
|
||||
(bStatus == 'RECENT' && aStatus == 'OFFLINE')
|
||||
)
|
||||
return 1
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user