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.status != 'OFFLINE' &&
|
||||||
(device.ip?.startsWith(search) ||
|
(device.ip?.startsWith(search) ||
|
||||||
device.apName?.contains(search) ||
|
device.apName?.contains(search) ||
|
||||||
device.essid?.contains(search))
|
device.essid?.contains(search) ||
|
||||||
|
device.hostname?.contains(search))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
: usersWithWifiDevices
|
: usersWithWifiDevices
|
||||||
|
|
||||||
// const sortedUsers = filteredUsers.sort((a, b) =>
|
|
||||||
// a.wifiDevices[0].lastSeen > b.wifiDevices[0].lastSeen ? -1 : 1
|
|
||||||
// )
|
|
||||||
|
|
||||||
const sortedUsers = filteredUsers.sort((a, b) => {
|
const sortedUsers = filteredUsers.sort((a, b) => {
|
||||||
|
const [aStatus, bStatus] = [
|
||||||
|
a.wifiDevices[0].status,
|
||||||
|
b.wifiDevices[0].status
|
||||||
|
]
|
||||||
if (
|
if (
|
||||||
(a.wifiDevices[0].status == 'ONLINE' &&
|
(aStatus == 'ONLINE' && bStatus == 'RECENT') ||
|
||||||
b.wifiDevices[0].status == 'RECENT') ||
|
(aStatus == 'ONLINE' && bStatus == 'OFFLINE') ||
|
||||||
(a.wifiDevices[0].status == 'ONLINE' &&
|
(aStatus == 'RECENT' && bStatus == 'OFFLINE')
|
||||||
b.wifiDevices[0].status == 'OFFLINE') ||
|
|
||||||
(a.wifiDevices[0].status == 'RECENT' &&
|
|
||||||
b.wifiDevices[0].status == 'OFFLINE')
|
|
||||||
)
|
)
|
||||||
return -1
|
return -1
|
||||||
if (
|
if (
|
||||||
(b.wifiDevices[0].status == 'ONLINE' &&
|
(bStatus == 'ONLINE' && aStatus == 'RECENT') ||
|
||||||
a.wifiDevices[0].status == 'RECENT') ||
|
(bStatus == 'ONLINE' && aStatus == 'OFFLINE') ||
|
||||||
(b.wifiDevices[0].status == 'ONLINE' &&
|
(bStatus == 'RECENT' && aStatus == 'OFFLINE')
|
||||||
a.wifiDevices[0].status == 'OFFLINE') ||
|
|
||||||
(b.wifiDevices[0].status == 'RECENT' &&
|
|
||||||
a.wifiDevices[0].status == 'OFFLINE')
|
|
||||||
)
|
)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user