feat(jobdetails): support executes at for bee queue

bee-queue · Mar 10, 2021 · 03b4932 · 03b4932
1 parent f783416
commit 03b4932
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/server/views/dashboard/jobDetails.js b/src/server/views/dashboard/jobDetails.js
@@ -25,6 +25,7 @@ async function handler(req, res) {
     return res.json(_.omit(job, 'domain', 'queue', '_events', '_eventsCount'));
   }
 
+  console.log(job);
   const jobState = queue.IS_BEE ? job.status : await job.getState();
   job.showRetryButton = !queue.IS_BEE || jobState === 'failed';
   job.retryButtonText = jobState === 'failed' ? 'Retry' : 'Trigger';

diff --git a/src/server/views/helpers/handlebars.js b/src/server/views/helpers/handlebars.js
@@ -61,8 +61,8 @@ const helpers = {
     return mapping;
   },
 
-  getDelayDate(job) {
-    return job.timestamp ? job.timestamp : job.options.timestamp + job.delay;
+  getTimestamp(job) {
+    return job.timestamp ? job.timestamp : job.options.timestamp;
   },
 
   encodeURI(url) {

diff --git a/src/server/views/partials/dashboard/jobDetails.hbs b/src/server/views/partials/dashboard/jobDetails.hbs
@@ -48,7 +48,12 @@
   {{#if this.delay}}
   <div class="col-sm-3">
     <h5>Executes At</h5>
-    {{moment (getDelayDate this) "llll"}}
+    {{moment (add this.delay (getTimestamp this) ) "llll"}}
+  </div>
+  {{else if this.options.delay}}
+  <div class="col-sm-3">
+    <h5>Executes At</h5>
+    {{moment (add this.options.delay (getTimestamp this) ) "llll"}}
   </div>
   {{/if}}