fix pendingactions ui

api/tacticalrmm/logs/views.py

@@ -109,7 +109,6 @@ class FilterOptionsAuditLog(APIView):
 class PendingActions(APIView):
     def patch(self, request):
         status_filter = "completed" if request.data["showCompleted"] else "pending"
-        completed = PendingAction.objects.filter(status="completed").count()
         if "agentPK" in request.data.keys():
             actions = PendingAction.objects.filter(
                 agent__pk=request.data["agentPK"], status=status_filter
@@ -122,7 +121,8 @@ class PendingActions(APIView):
 
         ret = {
             "actions": PendingActionSerializer(actions, many=True).data,
-            "completed_count": completed,
+            "completed_count": PendingAction.objects.filter(status="completed").count(),
+            "total": PendingAction.objects.count(),
         }
         return Response(ret)
 

web/src/components/modals/logs/PendingActions.vue

@@ -6,7 +6,7 @@
       <q-space />
       <q-btn dense flat icon="close" v-close-popup />
     </q-bar>
-    <div v-if="completedCount !== 0" class="q-pa-md">
+    <div v-if="totalCount !== 0" class="q-pa-md">
       <div class="row">
         <div class="col">
           <q-btn
@@ -109,6 +109,7 @@ export default {
       showCompleted: false,
       selectedStatus: null,
       completedCount: 0,
+      totalCount: 0,
       actionType: null,
       hostname: "",
       pagination: {
@@ -160,6 +161,7 @@ export default {
       this.$axios
         .patch("/logs/pendingactions/", data)
         .then(r => {
+          this.totalCount = r.data.total;
           this.completedCount = r.data.completed_count;
           this.actions = Object.freeze(r.data.actions);
           if (!!this.agentpk) this.hostname = r.data.actions[0].hostname;