From f8da81a895074599a755134565727960884ac94c Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Fri, 27 Nov 2020 10:48:20 -0400
Subject: [PATCH] Use built-in Data Iterator search

---
 web/src/views/WifiDevices.vue | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/web/src/views/WifiDevices.vue b/web/src/views/WifiDevices.vue
index d6ff00d..5ac3b1e 100644
--- a/web/src/views/WifiDevices.vue
+++ b/web/src/views/WifiDevices.vue
@@ -5,6 +5,7 @@
       :items-per-page.sync="itemsPerPage"
       :page="page"
       :loading="$apollo.queries.wifiDevices.loading"
+      :search="search"
     >
       <template #header>
         <v-toolbar flat class="mb-2">
@@ -120,14 +121,14 @@
                 </v-list-item>
                 <v-list-item>
                   <v-list-item-action>
-                    <Avatar :src="item.user.thumbnailPhoto" size="24px" />
+                    <Avatar :src="item.thumbnailPhoto" size="24px" />
                   </v-list-item-action>
                   <v-list-item-content>
                     <v-list-item-title>
-                      {{ item.user.displayName }}
+                      {{ item.displayName }}
                     </v-list-item-title>
                     <v-list-item-subtitle>
-                      {{ item.user.sAMAccountName }}
+                      {{ item.sAMAccountName }}
                     </v-list-item-subtitle>
                   </v-list-item-content>
                 </v-list-item>
@@ -149,7 +150,7 @@ export default {
   components: { Avatar },
   data: () => ({
     search: '',
-    itemsPerPage: 24,
+    itemsPerPage: 15,
     itemsPerPageArray: [15, 30, 60, 120],
     page: 1
   }),
@@ -184,24 +185,14 @@ export default {
     computedWifiDevices() {
       const filter = this.search.toLowerCase()
 
-      return this.wifiDevices
-        ?.map(device => ({
-          ...device,
-          hostname: device.hostname || 'Desconhecido',
-          isOnline: device.status == 'ONLINE',
-          user: device.user || {
-            displayName: 'Não autenticado',
-            sAMAccountName: null,
-            thumbnailPhoto: null
-          }
-        }))
-        .filter(
-          ({ ip, mac, user }) =>
-            ip.includes(filter) ||
-            mac.includes(filter) ||
-            user.displayName.toLowerCase().includes(filter) ||
-            user.sAMAccountName?.includes(filter)
-        )
+      return this.wifiDevices?.map(device => ({
+        ...device,
+        hostname: device.hostname || 'Desconhecido',
+        isOnline: device.status == 'ONLINE',
+        displayName: device.user?.displayName || 'Não autenticado',
+        sAMAccountName: device.user?.sAMAccountName,
+        thumbnailPhoto: device.user?.thumbnailPhoto
+      }))
     }
   }
 }