From ed65680a3bdac890168c0509ff9c2a43403be890 Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Wed, 16 Dec 2020 11:24:52 -0400
Subject: [PATCH] Fix: properly sort itens

---
 server/src/resolvers/Query.js |  8 +++-----
 web/src/views/WifiUsers.vue   | 18 +++++-------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/server/src/resolvers/Query.js b/server/src/resolvers/Query.js
index f226702..7f53595 100755
--- a/server/src/resolvers/Query.js
+++ b/server/src/resolvers/Query.js
@@ -97,13 +97,11 @@ const Query = {
       include: { wifiDevices: true }
     })
 
-    wifiUsers.sort(
+    return wifiUsers.sort(
       (a, b) =>
-        b.wifiDevices.filter(device => device.isOnline).length -
-        a.wifiDevices.filter(device => device.isOnline).length
+        b.wifiDevices.filter(device => device.status == 'ONLINE').length -
+        a.wifiDevices.filter(device => device.status == 'ONLINE').length
     )
-
-    return wifiUsers
   },
 
   async userPresence(_, { search }) {
diff --git a/web/src/views/WifiUsers.vue b/web/src/views/WifiUsers.vue
index 301cf00..2801e95 100644
--- a/web/src/views/WifiUsers.vue
+++ b/web/src/views/WifiUsers.vue
@@ -211,19 +211,11 @@ export default {
   }),
   computed: {
     sortedWifiUsers() {
-      const wifiUsers = [...this.wifiUsers]
-
-      return wifiUsers
-        ?.sort(
-          (a, b) =>
-            b.wifiDevices.filter(device => device.isOnline).length -
-            a.wifiDevices.filter(device => device.isOnline).length
-        )
-        .map(user => ({
-          ...user,
-          ips: user.wifiDevices.reduce((ips, device) => ` ${device.ip}`, ''),
-          wifiDevices: user.wifiDevices.sort(a => (a.isOnline ? -1 : 1))
-        }))
+      return this.wifiUsers?.map(user => ({
+        ...user,
+        ips: user.wifiDevices.reduce((ips, device) => ` ${device.ip}`, ''),
+        wifiDevices: user.wifiDevices.sort(a => (a.isOnline ? -1 : 1))
+      }))
     }
   },
   apollo: {