Added String.prototype.contains
This commit is contained in:
parent
c1752f41e0
commit
8522abdca0
|
@ -1,6 +1,7 @@
|
||||||
import {} from 'dotenv/config'
|
import {} from 'dotenv/config'
|
||||||
import '@babel/polyfill/noConflict'
|
import '@babel/polyfill/noConflict'
|
||||||
import './utils/capitalize'
|
import './utils/capitalize'
|
||||||
|
import './utils/contains'
|
||||||
import './utils/cycle'
|
import './utils/cycle'
|
||||||
|
|
||||||
import { logSuccess } from './lib/logger'
|
import { logSuccess } from './lib/logger'
|
||||||
|
|
|
@ -15,17 +15,15 @@ export async function userPresence(_, { search }) {
|
||||||
const filteredUsers = search
|
const filteredUsers = search
|
||||||
? usersWithWifiDevices.filter(
|
? usersWithWifiDevices.filter(
|
||||||
user =>
|
user =>
|
||||||
Object.keys(user).some(key =>
|
Object.keys(user).some(
|
||||||
typeof user[key] == 'string'
|
key => typeof user[key] == 'string' && user[key].contains(search)
|
||||||
? user[key].toLowerCase().includes(search)
|
|
||||||
: false
|
|
||||||
) ||
|
) ||
|
||||||
user.wifiDevices?.some(
|
user.wifiDevices?.some(
|
||||||
device =>
|
device =>
|
||||||
device.ip?.startsWith(search) ||
|
device.ip?.startsWith(search) ||
|
||||||
(device.status != 'OFFLINE' &&
|
(device.status != 'OFFLINE' &&
|
||||||
(device.apName?.toLowerCase().includes(search) ||
|
(device.apName?.contains(search) ||
|
||||||
device.essid?.toLocaleLowerCase().includes(search)))
|
device.essid?.contains(search)))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
: usersWithWifiDevices
|
: usersWithWifiDevices
|
||||||
|
|
3
server/src/utils/contains.js
Normal file
3
server/src/utils/contains.js
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
String.prototype.contains = function (term) {
|
||||||
|
return this.toLowerCase().includes(term.toLowerCase().trim())
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user