Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.0] Check that stat exists before calling toLocaleString on it - fixes #467 #469

Merged
merged 1 commit into from
Jan 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -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"
}
12 changes: 6 additions & 6 deletions resources/assets/js/pages/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand Down