From 3106278108ddf4530ab7040e28749cca35eb4d2c Mon Sep 17 00:00:00 2001
From: wh1te909 <dcparsi@gmail.com>
Date: Mon, 18 Jan 2021 09:12:01 +0000
Subject: [PATCH] fix agent table sort #250

---
 src/components/AgentTable.vue | 17 ++---------------
 src/views/Dashboard.vue       |  9 +++------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/components/AgentTable.vue b/src/components/AgentTable.vue
index fccd6e2..e3895da 100644
--- a/src/components/AgentTable.vue
+++ b/src/components/AgentTable.vue
@@ -53,12 +53,6 @@
           </q-icon>
         </q-th>
       </template>
-      <!--
-      <template v-slot:header-cell-antivirus="props">
-        <q-th auto-width :props="props">
-          <q-icon name="fas fa-shield-alt" size="1.2em" color="primary"><q-tooltip>Anti Virus</q-tooltip></q-icon>
-        </q-th>
-      </template>-->
       <template v-slot:header-cell-agentstatus="props">
         <q-th auto-width :props="props">
           <q-icon name="fas fa-signal" size="1.2em">
@@ -286,11 +280,8 @@
           <q-td key="hostname" :props="props">{{ props.row.hostname }}</q-td>
           <q-td key="description" :props="props">{{ props.row.description }}</q-td>
           <q-td key="user" :props="props">
-            <span class="text-italic" v-if="props.row.logged_in_username === 'None' && props.row.status === 'online'">{{
-              props.row.last_logged_in_user
-            }}</span>
-            <span v-else-if="props.row.logged_in_username !== 'None'">{{ props.row.logged_in_username }}</span>
-            <span v-else>-</span>
+            <span class="text-italic" v-if="props.row.italic">{{ props.row.logged_username }}</span>
+            <span v-else>{{ props.row.logged_username }}</span>
           </q-td>
           <q-td :props="props" key="patchespending">
             <q-icon v-if="props.row.patches_pending" name="far fa-clock" color="primary">
@@ -455,10 +446,6 @@ export default {
           }
         }
 
-        // fix for last_logged_in_user not filtering
-        if (row.logged_in_username === "None" && row.status === "online" && !!row.last_logged_in_user)
-          return row.last_logged_in_user.toLowerCase().indexOf(search) !== -1;
-
         // Normal text filter
         return cols.some(col => {
           const val = cellValue(col, row) + "";
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 5a9f743..e44a855 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -472,16 +472,13 @@ export default {
         {
           name: "user",
           label: "User",
-          field: "logged_in_username",
+          field: "logged_username",
           sortable: true,
           align: "left",
         },
         {
-          name: "lastuser",
-          label: "Last User",
-          field: "last_logged_in_user",
-          sortable: true,
-          align: "left",
+          name: "italic",
+          field: "italic",
         },
         {
           name: "patchespending",