formatting

laravel · Feb 14, 2021 · b4e8c6a · b4e8c6a
1 parent 9cbe57f
commit b4e8c6a
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 11,820 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/app-dark.css b/public/app-dark.css
diff --git a/public/app.css b/public/app.css
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=30865fb89488803d192a",
-    "/app.css": "/app.css?id=1dac05f3a17f5e92eea7",
-    "/app-dark.css": "/app-dark.css?id=821c845f9bf3b7853c33"
+    "/app.js": "/app.js?id=748961c604302b4c2389",
+    "/app.css": "/app.css?id=58229b999b8f6c26fffe",
+    "/app-dark.css": "/app-dark.css?id=cc86d678620cebdafaa7"
 }
diff --git a/resources/js/screens/dashboard.vue b/resources/js/screens/dashboard.vue
@@ -230,11 +230,12 @@
                     <div class="w-25 border-right">
                         <div class="p-4 mb-0">
                             <small class="text-uppercase">MAX WAIT TIME</small>
-                            <small v-if="stats.max_wait_queue">({{ stats.max_wait_queue }})</small>
 
-                            <h4 class="mt-4">
+                            <h4 class="mt-4 mb-0">
                                 {{ stats.max_wait_time ? humanTime(stats.max_wait_time) : '-' }}
                             </h4>
+
+                            <small class="mt-1" v-if="stats.max_wait_queue">({{ stats.max_wait_queue }})</small>
                         </div>
                     </div>
 
@@ -278,27 +279,29 @@
                 </thead>
 
                 <tbody>
-                <template v-for="queue in workload">
-                    <tr>
-                        <td :class="{'font-weight-bold': queue.split_queues}">
-                            <span>{{ queue.name.replace(/,/g, ', ') }}</span>
-                        </td>
-                        <td :class="{'font-weight-bold': queue.split_queues}">{{ queue.processes ? queue.processes.toLocaleString() : 0 }}</td>
-                        <td :class="{'font-weight-bold': queue.split_queues}">{{ queue.length ? queue.length.toLocaleString() : 0 }}</td>
-                        <td :class="{'font-weight-bold': queue.split_queues}" class="text-right">{{ humanTime(queue.wait) }}</td>
-                    </tr>
-                    <tr v-for="split_queue in queue.split_queues">
-                        <td>
-                            <svg class="icon info-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-                                <path d="M12.95 10.707l.707-.707L8 4.343 6.586 5.757 10.828 10l-4.242 4.243L8 15.657l4.95-4.95z"/>
-                            </svg>
-                            <span>{{ split_queue.name.replace(/,/g, ', ') }}</span>
-                        </td>
-                        <td>-</td>
-                        <td>{{ split_queue.length ? split_queue.length.toLocaleString() : 0 }}</td>
-                        <td class="text-right">{{ humanTime(split_queue.wait) }}</td>
-                    </tr>
-                </template>
+                    <template v-for="queue in workload">
+                        <tr>
+                            <td :class="{'font-weight-bold': queue.split_queues}">
+                                <span>{{ queue.name.replace(/,/g, ', ') }}</span>
+                            </td>
+                            <td :class="{'font-weight-bold': queue.split_queues}">{{ queue.processes ? queue.processes.toLocaleString() : 0 }}</td>
+                            <td :class="{'font-weight-bold': queue.split_queues}">{{ queue.length ? queue.length.toLocaleString() : 0 }}</td>
+                            <td :class="{'font-weight-bold': queue.split_queues}" class="text-right">{{ humanTime(queue.wait) }}</td>
+                        </tr>
+
+                        <tr v-for="split_queue in queue.split_queues">
+                            <td>
+                                <svg class="icon info-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+                                    <path d="M12.95 10.707l.707-.707L8 4.343 6.586 5.757 10.828 10l-4.242 4.243L8 15.657l4.95-4.95z"/>
+                                </svg>
+
+                                <span>{{ split_queue.name.replace(/,/g, ', ') }}</span>
+                            </td>
+                            <td>-</td>
+                            <td>{{ split_queue.length ? split_queue.length.toLocaleString() : 0 }}</td>
+                            <td class="text-right">{{ humanTime(split_queue.wait) }}</td>
+                        </tr>
+                    </template>
                 </tbody>
             </table>
         </div>

diff --git a/src/Repositories/RedisWorkloadRepository.php b/src/Repositories/RedisWorkloadRepository.php
@@ -69,6 +69,7 @@ public function get()
         return collect($this->waitTime->calculate())
             ->map(function ($waitTime, $queue) use ($processes) {
                 [$connection, $queueName] = explode(':', $queue, 2);
+
                 $totalProcesses = $processes[$queue] ?? 0;
 
                 $length = ! Str::contains($queue, ',')

diff --git a/src/WaitTimeCalculator.php b/src/WaitTimeCalculator.php
@@ -79,6 +79,36 @@ public function calculate($queue = null)
         })->sort()->reverse()->all();
     }
 
+    /**
+     * Get all of the queue names.
+     *
+     * @param  \Illuminate\Support\Collection  $supervisors
+     * @param  string|null  $queue
+     * @return \Illuminate\Support\Collection
+     */
+    protected function queueNames($supervisors, $queue = null)
+    {
+        $queues = $supervisors->map(function ($supervisor) {
+            return array_keys($supervisor->processes);
+        })->collapse()->unique()->values();
+
+        return $queue ? $queues->intersect([$queue]) : $queues;
+    }
+
+    /**
+     * Get the total process count for a given queue.
+     *
+     * @param  \Illuminate\Support\Collection  $allSupervisors
+     * @param  string  $queue
+     * @return int
+     */
+    protected function totalProcessesFor($allSupervisors, $queue)
+    {
+        return $allSupervisors->sum(function ($supervisor) use ($queue) {
+            return $supervisor->processes[$queue] ?? 0;
+        });
+    }
+
     /**
      * Calculate the time to clear for the given queue in seconds distributed over the given amount of processes.
      *
@@ -100,22 +130,6 @@ public function calculateTimeToClear($connection, $queue, $totalProcesses)
             : round(($timeToClear / $totalProcesses) / 1000);
     }
 
-    /**
-     * Get all of the queue names.
-     *
-     * @param  \Illuminate\Support\Collection  $supervisors
-     * @param  string|null  $queue
-     * @return \Illuminate\Support\Collection
-     */
-    protected function queueNames($supervisors, $queue = null)
-    {
-        $queues = $supervisors->map(function ($supervisor) {
-            return array_keys($supervisor->processes);
-        })->collapse()->unique()->values();
-
-        return $queue ? $queues->intersect([$queue]) : $queues;
-    }
-
     /**
      * Get the total time to clear (in milliseconds) for a given queue.
      *
@@ -129,18 +143,4 @@ protected function timeToClearFor($connection, $queue)
 
         return $size * $this->metrics->runtimeForQueue($queue);
     }
-
-    /**
-     * Get the total process count for a given queue.
-     *
-     * @param  \Illuminate\Support\Collection  $allSupervisors
-     * @param  string  $queue
-     * @return int
-     */
-    protected function totalProcessesFor($allSupervisors, $queue)
-    {
-        return $allSupervisors->sum(function ($supervisor) use ($queue) {
-            return $supervisor->processes[$queue] ?? 0;
-        });
-    }
 }