Add filtering

server/src/resolvers/Query/wifiDevices.js

@@ -1,17 +1,28 @@
 import prisma from '../../prisma'
 
-// TODO: Add filtering
+export async function wifiDevices(_, { take = 100, skip = 0, search }) {
-export async function wifiDevices(_, { identifiedOnly, nonIdentifiedOnly }) {
+  const mode = 'insensitive'
-  if (identifiedOnly && nonIdentifiedOnly)
+
-    throw new Error('Invalid combination of filters')
+  if (search === null)
+    search = undefined
 
   return prisma.wifiDevice.findMany({
+    where: {
+      OR: [
+        { hostname: { contains: search, mode } },
+        { mac: { contains: search, mode } },
+        { ip: { contains: search, mode } },
+        { apName: { contains: search, mode } },
+        { essid: { contains: search, mode } },
+        { oui: { contains: search, mode } },
+        { controller: { contains: search, mode } },
+        { user: { displayName: { contains: search, mode } } },
+        { user: { sAMAccountName: { contains: search, mode } } }
+      ]
+    },
     orderBy: [{ lastSeen: 'desc' }, { hostname: 'asc' }],
-    where: identifiedOnly
+    include: { user: true },
-      ? { NOT: { userId: null } }
+    take,
-      : nonIdentifiedOnly
+    skip
-      ? { userId: null }
-      : {},
-    include: { user: true }
   })
 }

server/src/typeDefs.js

@@ -35,9 +35,9 @@ const typeDefs = gql`
 
     "Devices that uses the Wi-Fi"
     wifiDevices(
-      search: String = ""
+      search: String = ""      
-      identifiedOnly: Boolean = false
+      take: Int
-      nonIdentifiedOnly: Boolean = false
+      skip: Int
     ): [WifiDevice]! @auth(roles: ["superAdmin"])
 
     "Users that uses the Wi-Fi"

web/src/views/WifiDevices.vue

@@ -32,10 +32,7 @@
     <v-container fluid>
       <div v-if="wifiDevices && stats" class="text-center my-4">
         <v-chip color="primary" class="mr-1" dark>
-          {{
+          {{ stats.onlineWifiDevices }}
-            wifiDevices &&
-            wifiDevices.filter(device => device.status == 'ONLINE').length
-          }}
         </v-chip>
         online de
         <v-chip class="mx-1">
@@ -48,7 +45,6 @@
         :items-per-page.sync="itemsPerPage"
         :page="page"
         :loading="$apollo.queries.wifiDevices.loading"
-        :search="search"
       >
         <template #default="{ items }">
           <v-expansion-panels multiple>
@@ -217,9 +213,10 @@ export default {
   apollo: {
     wifiDevices: {
       fetchPolicy: 'cache-and-network',
+      pollInterval: 10000,
       query: gql`
-        query {
+        query wifiDevices($search: String) {
-          wifiDevices {
+          wifiDevices(search: $search) {
             user {
               displayName
               sAMAccountName
@@ -238,13 +235,19 @@ export default {
             status
           }
         }
-      `
+      `,
+      variables() {
+        return {
+          search: this.search
+        }
+      }
     },
     stats: {
       query: gql`
         query {
           stats {
             totalWifiDevices
+            onlineWifiDevices
           }
         }
       `