Merge pull request #339 from roggervalf/fix-capitalize-function

Fix capitalize function

Author: Brad Vogel

README.md

@@ -1,5 +1,7 @@
 # Arena
 
+[![NPM](https://img.shields.io/npm/v/bull-arena.svg)](https://www.npmjs.com/package/bull-arena) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![NPM downloads](https://img.shields.io/npm/dm/bull-arena)](https://www.npmjs.com/package/bull-arena) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+
 An intuitive Web GUI for [Bee Queue](https://github.com/bee-queue/bee-queue) and [Bull](https://github.com/optimalbits/bull). Built on Express so you can run Arena standalone, or mounted in another app as middleware.
 
 For a quick introduction to the motivations for creating Arena, read _[Interactively monitoring Bull, a Redis-backed job queue for Node](https://www.mixmax.com/blog/introducing-bull-arena)_.

src/server/views/helpers/handlebars.js

@@ -68,11 +68,11 @@ const helpers = {
     return encodeURIComponent(url);
   },
 
-  capitalize(s) {
+  capitalize(value) {
     if (typeof value !== 'string') {
       return '';
     }
-    return s.charAt(0).toUpperCase() + s.slice(1);
+    return value.charAt(0).toUpperCase() + value.slice(1);
   },
 
   add(a, b) {

src/server/views/partials/dashboard/jobDetails.hbs

@@ -1,16 +1,18 @@
 {{#unless displayJobInline}}
-  <h3>{{ this.id }}</h3>
+<h3>{{ this.id }}</h3>
 {{/unless}}
 
 <h5>Actions</h5>
-<button class="btn btn-danger js-remove-job" data-queue-host="{{ queueHost }}" data-queue-name="{{ queueName }}" data-job-id="{{ this.id }}" data-job-state="{{ jobState }}">
+<button class="btn btn-danger js-remove-job" data-queue-host="{{ queueHost }}" data-queue-name="{{ queueName }}"
+  data-job-id="{{ this.id }}" data-job-state="{{ jobState }}">
   Remove
 </button>
 
 {{#if showRetryButton}}
-  <button class="btn btn-success js-retry-job" data-queue-host="{{ queueHost }}" data-queue-name="{{ queueName }}" data-job-id="{{ this.id }}">
-    {{ retryButtonText }}
-  </button>
+<button class="btn btn-success js-retry-job" data-queue-host="{{ queueHost }}" data-queue-name="{{ queueName }}"
+  data-job-id="{{ this.id }}">
+  {{ retryButtonText }}
+</button>
 {{/if}}
 
 
@@ -23,48 +25,60 @@
   <div class="col-sm-3">
     <h5>Timestamp</h5>
     {{#if this.options.timestamp}}
-      {{moment this.options.timestamp "llll"}}
+    {{moment this.options.timestamp "llll"}}
     {{/if}}
     {{#if this.timestamp}}
-      {{moment this.timestamp "llll"}}
+    {{moment this.timestamp "llll"}}
     {{/if}}
   </div>
 
+  {{#if this.processedOn}}
+  <div class="col-sm-3">
+    <h5>Processed On</h5>
+    {{moment this.processedOn "llll"}}
+  </div>
+  {{/if}}
+
+  {{#if this.finishedOn}}
+  <div class="col-sm-3">
+    <h5>Finished On</h5>
+    {{moment this.finishedOn "llll"}}
+  </div>
+  {{/if}}
+
   <div class="col-sm-3">
     <h5>Attempts Made</h5>
     {{this.attemptsMade}}
 
     {{#if this.options}}
-      {{length this.options.stacktraces}}
+    {{length this.options.stacktraces}}
     {{/if}}
   </div>
 </div>
 <div class="row">
   <div class="col-sm-4">
     <h5>Permalinks</h5>
-    <a href="{{ basePath }}/{{ encodeURI queueHost }}/{{ encodeURI queueName }}/{{ this.id }}" class="btn btn-info">Job {{ this.id }}</a>
-    <a href="{{ basePath }}/{{ encodeURI queueHost }}/{{ encodeURI queueName }}/{{ this.id }}?json=true" class="btn btn-info">JSON</a>
+    <a href="{{ basePath }}/{{ encodeURI queueHost }}/{{ encodeURI queueName }}/{{ this.id }}" class="btn btn-info">Job
+      {{ this.id }}</a>
+    <a href="{{ basePath }}/{{ encodeURI queueHost }}/{{ encodeURI queueName }}/{{ this.id }}?json=true"
+      class="btn btn-info">JSON</a>
   </div>
 </div>
 
 {{#unless this.queue.IS_BEE}}
 <h5>Progress</h5>
 {{#if (isNumber this._progress)}}
-  <div class="progress">
-    <div class="progress-bar
+<div class="progress">
+  <div class="progress-bar
                 {{#eq jobState 'failed'}}
                 progress-bar-danger
-                {{/eq}}"
-        role="progressbar"
-        aria-valuenow="{{ this._progress }}"
-        aria-valuemin="0"
-        aria-valuemax="100"
-        style="width: {{ this._progress }}%; min-width: 2em;">
-      {{ this._progress }}%
-    </div>
+                {{/eq}}" role="progressbar" aria-valuenow="{{ this._progress }}" aria-valuemin="0" aria-valuemax="100"
+    style="width: {{ this._progress }}%; min-width: 2em;">
+    {{ this._progress }}%
   </div>
+</div>
 {{else}}
-  <pre>{{json this._progress true}}</pre>
+<pre>{{json this._progress true}}</pre>
 {{/if}}
 {{/unless}}
 
@@ -79,15 +93,15 @@
 {{/if}}
 
 {{#if stacktraces}}
-  <h5>Stacktraces</h5>
-  {{#each stacktraces}}
-    <pre>{{ this }}</pre>
-  {{/each}}
+<h5>Stacktraces</h5>
+{{#each stacktraces}}
+<pre>{{ this }}</pre>
+{{/each}}
 {{/if}}
 
 
 <h5>Data</h5>
 <pre><code class="json">{{json this.data true}}</code></pre>
 
 <h5>Logs</h5>
-<pre><code class="json">{{json this.logs true}}</code></pre>
+<pre><code class="json">{{json this.logs true}}</code></pre>