Added subnetInfo
This commit is contained in:
parent
995739e611
commit
ee7714c6da
|
@ -1,4 +1,5 @@
|
|||
import prisma from '../../prisma'
|
||||
import { getSubnetInfo } from '../../utils/subnetInfo'
|
||||
|
||||
export async function userPresence(_, { search }) {
|
||||
if (!search) search = ''
|
||||
|
@ -67,7 +68,8 @@ export async function userPresence(_, { search }) {
|
|||
lastSeen: userPresence.wifiDevices[0].lastSeen,
|
||||
status: userPresence.wifiDevices[0].status,
|
||||
apName: userPresence.wifiDevices[0].accessPoint?.name || userPresence.wifiDevices[0].apName || userPresence.wifiDevices[0].accessPoint?.hostname,
|
||||
local: userPresence.wifiDevices[0].accessPoint?.local
|
||||
local: userPresence.wifiDevices[0].accessPoint?.local,
|
||||
campus: getSubnetInfo(userPresence.wifiDevices[0].accessPoint?.ip).shortName
|
||||
}))
|
||||
.slice(0, 200)
|
||||
}
|
||||
|
|
|
@ -246,6 +246,7 @@ const typeDefs = gql`
|
|||
status: Status!
|
||||
apName: String!
|
||||
local: String
|
||||
campus: String
|
||||
}
|
||||
|
||||
"The status of a Device"
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import ip from 'ip'
|
||||
import { isIPv4 } from 'net'
|
||||
|
||||
const subNetsInfo = [
|
||||
{
|
||||
|
@ -96,9 +97,9 @@ export const subNets = subNetsInfo.map(subNetInfo => ({
|
|||
}))
|
||||
|
||||
export function getSubnetInfo(ip) {
|
||||
const subnet = subNets.find(subnet => subnet.contains(ip))
|
||||
|
||||
|
||||
return subnet
|
||||
if (isIPv4(ip)) return subNets.find(subnet => subnet.contains(ip))
|
||||
else return {
|
||||
shortName: 'XX',
|
||||
name: 'Desconhecido'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -113,6 +113,7 @@
|
|||
bottom
|
||||
offset-x="18px"
|
||||
offset-y="18px"
|
||||
:content="userPresence.campus"
|
||||
>
|
||||
<Avatar :src="userPresence.thumbnailPhoto" size="52px" />
|
||||
</v-badge>
|
||||
|
@ -125,7 +126,7 @@
|
|||
|
||||
<template v-if="userPresence.status == 'ONLINE'">
|
||||
<v-list-item-subtitle>
|
||||
<span class="font-weight-medium">On-line</span>
|
||||
<span class="font-weight-medium mr-1">On-line</span>
|
||||
</v-list-item-subtitle>
|
||||
<v-list-item-subtitle>
|
||||
<span v-if="userPresence.local" class="font-weight-medium">
|
||||
|
@ -301,6 +302,7 @@ export default {
|
|||
status
|
||||
apName
|
||||
local
|
||||
campus
|
||||
}
|
||||
}
|
||||
`,
|
||||
|
|
Loading…
Reference in New Issue
Block a user