Merge pull request #469 from michaeldyrynda/2.0

[2.0] Check that stat exists before calling toLocaleString on it - fixes #467
laravel · Jan 14, 2019 · e722f71 · e722f71
2 parents 1ad8910 + 4388734
commit e722f71
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.map b/public/js/app.js.map
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/app.js": "/js/app.js?id=5bd5c82ff546bec19c3f",
+    "/js/app.js": "/js/app.js?id=75e00d45a19dae52469b",
     "/css/app.css": "/css/app.css?id=c7ed9301f1d8740d3073",
-    "/js/app.js.map": "/js/app.js.map?id=48e61cb2c5996918015a",
+    "/js/app.js.map": "/js/app.js.map?id=f9e7a82ee156595a512e",
     "/css/app.css.map": "/css/app.css.map?id=5d0439ebaab1434c7ea0"
 }
diff --git a/resources/assets/js/pages/Dashboard.vue b/resources/assets/js/pages/Dashboard.vue
@@ -170,21 +170,21 @@
                                 <h2 class="stat-title">Jobs Per Minute</h2>
                                 <h3 class="stat-meta">&nbsp;</h3>
                                 <span class="stat-value">
-                                    {{ stats.jobsPerMinute.toLocaleString() }}
+                                    {{ stats.jobsPerMinute ? stats.jobsPerMinute.toLocaleString() : 0 }}
                                 </span>
                             </div>
                             <div class="stat col-3 p-4">
                                 <h2 class="stat-title" v-text="recentJobsPeriod"></h2>
                                 <h3 class="stat-meta">&nbsp;</h3>
                                 <span class="stat-value">
-                                    {{ stats.recentJobs.toLocaleString() }}
+                                    {{ stats.recentJobs ? stats.recentJobs.toLocaleString() : 0 }}
                                 </span>
                             </div>
                             <div class="stat col-3 p-4">
                                 <h2 class="stat-title" v-text="recentlyFailedPeriod"></h2>
                                 <h3 class="stat-meta">&nbsp;</h3>
                                 <span class="stat-value">
-                                    {{ stats.recentlyFailed.toLocaleString() }}
+                                    {{ stats.recentlyFailed ? stats.recentlyFailed.toLocaleString() : 0 }}
                                 </span>
                             </div>
                             <div class="stat col-3 p-4 border-right-0">
@@ -203,7 +203,7 @@
                                 <h2 class="stat-title">Total Processes</h2>
                                 <h3 class="state-meta">&nbsp;</h3>
                                 <span class="stat-value">
-                                    {{ stats.processes.toLocaleString() }}
+                                    {{ stats.processes ? stats.processes.toLocaleString() : 0 }}
                                 </span>
                             </div>
 
@@ -254,8 +254,8 @@
                             <td>
                                 <span>{{ queue.name }}</span>
                             </td>
-                            <td>{{ queue.processes.toLocaleString() }}</td>
-                            <td>{{ queue.length.toLocaleString() }}</td>
+                            <td>{{ queue.processes ? stats.processes.toLocaleString() : 0 }}</td>
+                            <td>{{ queue.length ? stats.length.toLocaleString() : 0 }}</td>
                             <td>{{ humanTime(queue.wait) }}</td>
                         </tr>
                         </tbody>