feat(job-details): show raw progress when not numeric

bee-queue · Aug 5, 2020 · bd0d697 · bd0d697
1 parent 63ca0c8
commit bd0d697
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/server/views/helpers/handlebars.js b/src/server/views/helpers/handlebars.js
@@ -23,6 +23,10 @@ const helpers = {
     return new Handlebars.SafeString(JSON.stringify(...args));
   },
 
+  isNumber(operand) {
+    return parseInt(operand, 10).toString() === String(operand);
+  },
+
   adjustedPage(currentPage, pageSize, newPageSize) {
     const firstId = (currentPage - 1) * pageSize;
     return _.ceil(firstId / newPageSize) + 1;

diff --git a/src/server/views/partials/dashboard/jobDetails.hbs b/src/server/views/partials/dashboard/jobDetails.hbs
@@ -49,19 +49,23 @@
 
 {{#unless this.queue.IS_BEE}}
 <h5>Progress</h5>
-<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 }}%
+{{#if (isNumber this._progress)}}
+  <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>
   </div>
-</div>
+{{else}}
+  <pre>{{json this._progress true}}</pre>
+{{/if}}
 {{/unless}}
 
 {{#if this.returnvalue}}