- Progress Update

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server/job/job-lifecycle.js

@@ -5,7 +5,18 @@ const durationToHumanReadable = require("../utils/durationToHumanReadable");
 const calculateStatusDuration = require("../utils/calculateStatusDuration");
 
 const jobLifecycle = async (req, res) => {
-    const {jobids} = req.body;
+    // Grab the jobids and statuses from the request body
+    const {
+        jobids,
+        statuses
+    } = req.body;
+
+
+    if (!jobids) {
+        return res.status(400).json({
+            error: "Missing jobids"
+        });
+    }
 
     const jobIDs = _.isArray(jobids) ? jobids : [jobids];
     const client = req.userGraphQLClient;
@@ -45,7 +56,7 @@ const jobLifecycle = async (req, res) => {
 
         groupedTransitions[jobId] = {
             lifecycle: lifecycle,
-            durations: calculateStatusDuration(lifecycle)
+            durations: calculateStatusDuration(lifecycle, statuses),
         };
     }
 

server/utils/calculateStatusDuration.js

@@ -11,7 +11,7 @@ const getColor = (key) => {
     return '#' + (num % 16777215).toString(16).padStart(6, '0');
 };
 
-const calculateStatusDuration = (transitions) => {
+const calculateStatusDuration = (transitions, statuses) => {
     let statusDuration = {};
     let totalDuration = 0;
     let summations = [];
@@ -64,14 +64,24 @@ const calculateStatusDuration = (transitions) => {
 
     for (let [status, {value, humanReadable}] of Object.entries(statusDuration)) {
         if (status !== 'total') {
-            summations.push({status, value, humanReadable, percentage: statusDuration[status].percentage, color: getColor(status), roundedPercentage: `${Math.round(statusDuration[status].percentage)}%`});
+            summations.push({
+                status,
+                value,
+                humanReadable,
+                percentage: statusDuration[status].percentage,
+                color: getColor(status),
+                roundedPercentage: `${Math.round(statusDuration[status].percentage)}%`
+            });
         }
     }
 
     const humanReadableTotal = durationToHumanReadable(moment.duration(totalDuration));
 
+
     return {
-        summations: _.orderBy(summations, ['value'], ['asc']),
+        summations: _.isArray(statuses) && !_.isEmpty(statuses) ? summations.sort((a, b) => {
+            return statuses.indexOf(a.status) - statuses.indexOf(b.status);
+        }) : summations,
         totalStatuses: summations.length,
         total: totalDuration,
         humanReadableTotal