fix(job-details): generate more accurate executes at (#689)

Author: roggervalf

example/bullmq.js

@@ -72,6 +72,18 @@ async function main() {
 
   // adding delayed jobs
   const delayedJob = await queue.add('delayed', {}, {delay: 60 * 1000});
+  await queue.add(
+    'delayed',
+    {},
+    {
+      delay: 1000,
+      attempts: 4,
+      backoff: {
+        type: 'exponential',
+        delay: 60000,
+      },
+    }
+  );
   await queue.add('cron', {}, {repeat: {pattern: '* 1 * 1 *'}});
   delayedJob.log('Log message');
 

src/server/views/helpers/handlebars.js

@@ -76,7 +76,11 @@ const helpers = {
   getDelayedExecutionAt(job) {
     // Bull
     if (job.delay) {
-      return job.delay + getTimestamp(job);
+      if (job.processedOn) {
+        return job.processedOn + job.delay;
+      } else {
+        return job.timestamp + job.delay;
+      }
     }
 
     // Bee

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

@@ -42,8 +42,16 @@
 
   <div class="col-sm-3">
     <h5>Timestamp</h5>
-    {{#if (getTimestamp this)}}
-    {{moment (getTimestamp this) "llll"}}
+    {{#if queue.IS_BEE}}
+      {{#if this.options}}
+        {{#if (isNumber this.options.timestamp)}}
+          {{moment this.options.timestamp "llll"}}
+        {{/if}}
+      {{/if}}
+    {{else}}
+      {{#if (isNumber this.timestamp)}}
+        {{moment this.timestamp "llll"}}
+      {{/if}}
     {{/if}}
   </div>
 
@@ -76,6 +84,13 @@
     {{length this.options.stacktraces}}
     {{/if}}
   </div>
+
+  {{#if (isNumber this.attemptsStarted)}}
+  <div class="col-sm-3">
+    <h5>Attempts Started</h5>
+    {{this.attemptsStarted}}
+  </div>
+  {{/if}}
 </div>
 <div class="row">
   <div class="col-sm-4">