From 75913e8da466cd3fffa985cbf99476d65ead1e1f Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Mon, 2 May 2022 16:30:56 -0400
Subject: [PATCH] Bugfix

---
 server/src/resolvers/User.js            | 13 ++++++-------
 web/src/components/WifiDevicesTable.vue | 20 ++++++--------------
 web/src/views/WifiUsers.vue             |  1 -
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/server/src/resolvers/User.js b/server/src/resolvers/User.js
index b99e831..94b2ea7 100755
--- a/server/src/resolvers/User.js
+++ b/server/src/resolvers/User.js
@@ -48,13 +48,12 @@ const User = {
     )
       return []
 
-    return prisma.user
-      .findUnique({
-        where: {
-          sAMAccountName: parent.sAMAccountName
-        }
-      })
-      .wifiDevices()
+    return prisma.wifiDevice.findMany({
+      where: {
+        accessPointId: { not: null },
+        user: { id: parent.id }
+      }
+    })
   },
 
   campus: parent => {
diff --git a/web/src/components/WifiDevicesTable.vue b/web/src/components/WifiDevicesTable.vue
index 601d1a5..0089a35 100644
--- a/web/src/components/WifiDevicesTable.vue
+++ b/web/src/components/WifiDevicesTable.vue
@@ -13,10 +13,10 @@
       calculate-widths
     >
       <template #[`item.status`]="{ item }">
-        <v-chip v-if="item.status == 'ONLINE'" color="green" dark small>
+        <v-chip v-if="item.status == 'ONLINE'" color="green" dark x-small>
           Online
         </v-chip>
-        <v-chip v-else color="grey" small dark>Offline</v-chip>
+        <v-chip v-else color="grey" dark x-small>Offline</v-chip>
       </template>
       <template #[`item.ip`]="{ item }">
         <code> {{ item.ip }}</code>
@@ -40,6 +40,9 @@
         >
           {{ item.apName }}
         </router-link>
+        <span v-if="item.accessPoint.local">
+          ({{ item.accessPoint.local }})
+        </span>
       </template>
       <template #[`item.uptime`]="{ item }">
         <span v-if="item.uptime > 0">
@@ -49,21 +52,12 @@
         </span>
         <span v-else><small> Off-line </small> </span>
       </template>
-      <template #[`item.controller`]="{ item }">
-        <ApIcon :controller="item.controller" />
-      </template>
-      <template #[`item.local`]="{ item }">
-        {{ item.accessPoint.local }}
-      </template>
     </v-data-table>
   </div>
 </template>
 
 <script>
-import ApIcon from '@/components/ApIcon.vue'
-
 export default {
-  components: { ApIcon },
   props: {
     wifiDevices: {
       type: Array,
@@ -78,13 +72,11 @@ export default {
       { text: 'MAC', value: 'mac' },
       { text: 'Status', value: 'status' },
       { text: 'ESSID', value: 'essid' },
-      { text: 'Controladora', value: 'controller' },
       { text: 'Uptime', value: 'uptime' },
       { text: 'Marca', value: 'oui' },
       { text: 'Primeira aparição', value: 'firstSeen' },
       { text: 'Última aparição', value: 'lastSeen' },
-      { text: 'AccessPoint', value: 'apName' },
-      { text: 'Local', value: 'local' }
+      { text: 'AccessPoint', value: 'apName' }
     ]
   }),
   computed: {
diff --git a/web/src/views/WifiUsers.vue b/web/src/views/WifiUsers.vue
index 406d51a..5b7fa31 100644
--- a/web/src/views/WifiUsers.vue
+++ b/web/src/views/WifiUsers.vue
@@ -91,7 +91,6 @@
             </v-expansion-panel-header>
             <v-expansion-panel-content>
               <v-expansion-panels accordion>
-                <v-divider />
                 <wifi-devices-table :wifi-devices="user.wifiDevices" />
               </v-expansion-panels>
             </v-expansion-panel-content>