Merge pull request #21 from aloware/add-missing-queue-jobs-count

Fix | Add Missing Queue Jobs Count
aloware · Jun 16, 2022 · c2dfcaf · c2dfcaf
2 parents 3ab7fa8 + 2b9abfd
commit c2dfcaf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=c9012e81395894c0c41ecaeaf88b55a7",
+    "/app.js": "/app.js?id=4c5251654aeb0e203261c2abf1eaf792",
     "/app-dark.css": "/app-dark.css?id=cd1d3557e4d1ad0ee48178571d428a17",
     "/app.css": "/app.css?id=764ab48074813350c86491591a7e63b4"
 }
diff --git a/resources/js/screens/failed-queues/index.vue b/resources/js/screens/failed-queues/index.vue
@@ -143,7 +143,7 @@
                             {{ queue.queue }}
                         </router-link>
                     </td>
-                    <td>{{ queue.count }}</td>
+                    <td>{{ queue.partitions_count }}</td>
                 </tr>
                 </tbody>
             </table>

diff --git a/resources/js/screens/queues/index.vue b/resources/js/screens/queues/index.vue
@@ -140,6 +140,7 @@
                 <tr>
                     <th>Queue Name</th>
                     <th>Queue Partitions</th>
+                    <th>Number of Jobs</th>
                     <th></th>
                 </tr>
                 </thead>
@@ -151,7 +152,8 @@
                             {{ queue.queue }}
                         </router-link>
                     </td>
-                    <td>{{ queue.count }}</td>
+                    <td>{{ queue.partitions_count }}</td>
+                    <td>{{ queue.jobs_count }}</td>
                     <td class="gen-btn">
                         <button @click="showFakeSignalModal(queue.queue)" class="btn btn-primary btn-sm">Fake Signal Gen</button>
                     </td>

diff --git a/resources/js/screens/queues/job-preview.vue b/resources/js/screens/queues/job-preview.vue
@@ -3,12 +3,18 @@
         <div class="card mt-4" v-if="ready">
             <div class="card-header d-flex align-items-center justify-content-between">
                 <h5>Job Data</h5>
-
                 <a data-toggle="collapse" href="#collapseData" role="button">
                     Collapse
                 </a>
             </div>
 
+            <div class="card-body">
+                <hr>
+                <div><strong>Queue:</strong> {{ this.$route.params.queue }}</div>
+                <div><strong>Partition:</strong> {{ this.$route.params.partition }}</div>
+                <hr>
+            </div>
+
             <div class="card-body code-bg text-white collapse show" id="collapseData">
                 <vue-json-pretty :data="prettyPrintJob(job)"></vue-json-pretty>
             </div>

diff --git a/src/Repositories/RedisRepository.php b/src/Repositories/RedisRepository.php
@@ -358,7 +358,8 @@ private function queuesWithPartitionsPrivate(
         foreach ($this->$queuesResolver() as $queue) {
             $queues[] = [
                 'queue' => $queue,
-                'count' => count($this->$partitionsResolver($queue))
+                'partitions_count' => count($this->$partitionsResolver($queue)),
+                'jobs_count' => $this->totalJobsCount([$queue])
             ];
         }