Refactor to use isOnline prop

This commit is contained in:
Douglas Barone 2020-11-30 14:50:20 -04:00
parent 73fb2c49ae
commit 12b65aa560
6 changed files with 15 additions and 26 deletions

View File

@ -10,9 +10,7 @@
<v-list-item-avatar size="52px" style="overflow: visible"> <v-list-item-avatar size="52px" style="overflow: visible">
<v-badge <v-badge
:color=" :color="
userPresence.wifiDevices.some( userPresence.wifiDevices.some(wifiDevice => wifiDevice.isOnline)
wifiDevice => wifiDevice.status === 'ONLINE'
)
? 'green' ? 'green'
: 'grey' : 'grey'
" "
@ -28,9 +26,7 @@
<v-list-item-title> <v-list-item-title>
{{ userPresence.user.displayName }} {{ userPresence.user.displayName }}
</v-list-item-title> </v-list-item-title>
<v-list-item-subtitle <v-list-item-subtitle v-if="!userPresence.wifiDevices[0].isOnline">
v-if="userPresence.wifiDevices[0].status === 'OFFLINE'"
>
<span class="font-weight-medium">Off-line.</span> <span class="font-weight-medium">Off-line.</span>
Visto {{ userPresence.wifiDevices[0].lastSeen | from }} Visto {{ userPresence.wifiDevices[0].lastSeen | from }}
</v-list-item-subtitle> </v-list-item-subtitle>

View File

@ -3,9 +3,7 @@
<v-expansion-panel-header> <v-expansion-panel-header>
<v-icon <v-icon
class="shrink mr-2" class="shrink mr-2"
:color=" :color="wifiDevice.isOnline ? 'green darken-1' : 'grey lighten-1'"
wifiDevice.status === 'ONLINE' ? 'green darken-1' : 'grey lighten-1'
"
> >
mdi-cellphone-link mdi-cellphone-link
</v-icon> </v-icon>
@ -15,7 +13,7 @@
</v-expansion-panel-header> </v-expansion-panel-header>
<v-expansion-panel-content> <v-expansion-panel-content>
<v-list> <v-list>
<v-list-item v-if="wifiDevice.status === 'ONLINE'"> <v-list-item v-if="wifiDevice.isOnline">
<v-list-item-action> <v-list-item-action>
<v-icon color="green darken-1">mdi-wifi</v-icon> <v-icon color="green darken-1">mdi-wifi</v-icon>
</v-list-item-action> </v-list-item-action>

View File

@ -40,7 +40,7 @@ export default {
lastSeen lastSeen
mac mac
oui oui
status isOnline
uptime uptime
} }
} }

View File

@ -83,7 +83,7 @@ export default {
apName apName
id id
lastSeen lastSeen
status isOnline
controller controller
} }
} }

View File

@ -212,7 +212,7 @@ export default {
ip ip
uptime uptime
apName apName
status isOnline
} }
} }
` `
@ -225,7 +225,6 @@ export default {
return this.wifiDevices?.map(device => ({ return this.wifiDevices?.map(device => ({
...device, ...device,
hostname: device.hostname || 'Desconhecido', hostname: device.hostname || 'Desconhecido',
isOnline: device.status == 'ONLINE',
displayName: device.user?.displayName || 'Não autenticado', displayName: device.user?.displayName || 'Não autenticado',
sAMAccountName: device.user?.sAMAccountName, sAMAccountName: device.user?.sAMAccountName,
thumbnailPhoto: device.user?.thumbnailPhoto, thumbnailPhoto: device.user?.thumbnailPhoto,

View File

@ -41,7 +41,7 @@
bottom bottom
:content=" :content="
user.wifiDevices user.wifiDevices
.filter(wifiDevice => wifiDevice.status === 'ONLINE') .filter(wifiDevice => wifiDevice.isOnline)
.length.toString() .length.toString()
" "
> >
@ -53,7 +53,7 @@
bottom bottom
:content=" :content="
user.wifiDevices user.wifiDevices
.filter(wifiDevice => wifiDevice.status === 'OFFLINE') .filter(wifiDevice => !wifiDevice.isOnline)
.length.toString() .length.toString()
" "
> >
@ -69,9 +69,7 @@
> >
<v-expansion-panel-header> <v-expansion-panel-header>
<div> <div>
<v-icon <v-icon left :color="device.isOnline ? 'green' : ''"
left
:color="device.status == 'ONLINE' ? 'green' : ''"
>mdi-cellphone-wireless</v-icon >mdi-cellphone-wireless</v-icon
> >
{{ device.hostname || device.mac }} {{ device.oui }} {{ device.hostname || device.mac }} {{ device.oui }}
@ -79,7 +77,7 @@
</v-expansion-panel-header> </v-expansion-panel-header>
<v-expansion-panel-content <v-expansion-panel-content
><v-list dense> ><v-list dense>
<v-list-item v-if="device.status == 'ONLINE'"> <v-list-item v-if="device.isOnline">
<v-list-item-action> <v-list-item-action>
<v-icon color="green darken-1">mdi-wifi</v-icon> <v-icon color="green darken-1">mdi-wifi</v-icon>
</v-list-item-action> </v-list-item-action>
@ -197,14 +195,12 @@ export default {
return this.wifiUsers return this.wifiUsers
?.sort( ?.sort(
(a, b) => (a, b) =>
b.wifiDevices.filter(device => device.status == 'ONLINE').length - b.wifiDevices.filter(device => device.isOnline).length -
a.wifiDevices.filter(device => device.status == 'ONLINE').length a.wifiDevices.filter(device => device.isOnline).length
) )
.map(user => ({ .map(user => ({
...user, ...user,
wifiDevices: user.wifiDevices.sort(a => wifiDevices: user.wifiDevices.sort(a => (a.isOnline ? -1 : 1))
a.status == 'ONLINE' ? -1 : 1
)
})) }))
} }
}, },
@ -224,7 +220,7 @@ export default {
hostname hostname
firstSeen firstSeen
lastSeen lastSeen
status isOnline
apName apName
essid essid
} }