Merge pull request #1184 from wxtim/show_mean_times_as_iso_durations

show mean times as iso durations

Author: wxtim

CHANGES.md

@@ -11,6 +11,13 @@ creating a new release entry be sure to copy & paste the span tag with the
 updated. Only the first match gets replaced, so it's fine to leave the old
 ones in. -->
 
+## __cylc-ui-1.5.0 (<span actions:bind='release-date'>Released 2023-01-16</span>)__
+
+### Enhancements
+
+[#1184](https://github.com/cylc/cylc-ui/pull/1184) - Mean times for tasks
+in table changed to human readable ISO duration format.
+
 ## __cylc-ui-1.4.0 (<span actions:bind='release-date'>Released 2023-01-16</span>)__
 
 ### Enhancements

src/components/cylc/table/Table.vue

@@ -169,6 +169,7 @@ import { DEFAULT_COMPARATOR } from '@/components/cylc/common/sort'
 import { datetimeComparator } from '@/components/cylc/table/sort'
 import { matchNode } from '@/components/cylc/common/filter'
 import TaskFilter from '@/components/cylc/TaskFilter.vue'
+import { dtMean } from '@/utils/tasks'
 
 export default {
   name: 'TableComponent',
@@ -257,15 +258,7 @@ export default {
     }
   },
   methods: {
-    dtMean (taskNode) {
-      const ret = taskNode.node?.task?.meanElapsedTime
-      if (ret) {
-        return ret.toFixed()
-      }
-      // the meanElapsedTime can be undefined (e.g. task has not run before)
-      // return "undefined" rather than a number for these cases
-      return undefined
-    }
+    dtMean
   }
 }
 </script>

src/utils/tasks.js

@@ -105,3 +105,27 @@ export {
   latestJob,
   jobMessageOutputs
 }
+
+export function dtMean (taskNode) {
+  // Convert to an easily read duration format:
+  const dur = taskNode.node?.task?.meanElapsedTime
+  if (dur) {
+    const seconds = dur % 60
+    const minutes = ((dur - seconds) / 60) % 60
+    const hours = ((dur - minutes * 60 - seconds) / 3600) % 24
+    const days = (dur - hours * 3600 - minutes * 60 - seconds) / 86400
+
+    let dayss = ''
+    if (days > 0) {
+      dayss = days.toString() + 'd '
+    }
+
+    return dayss +
+      hours.toString().padStart(2, '0') +
+      ':' + minutes.toString().padStart(2, '0') +
+      ':' + Math.round(seconds).toString().padStart(2, '0')
+  }
+  // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
+  // return "undefined" rather than a number for these cases
+  return undefined
+}

tests/e2e/specs/table.cy.js

@@ -137,7 +137,7 @@ describe('Table view', () => {
         // check 7 is at the top (1st row, 10th column)
         .get('tbody > :nth-child(1) > :nth-child(10)')
         .should(($ele) => {
-          expect($ele.text().trim()).equal('7')
+          expect($ele.text().trim()).equal('00:00:07')
         })
     })
   })

tests/unit/utils/tasks.spec.js

@@ -17,7 +17,7 @@
 
 import { expect } from 'chai'
 import TaskState from '@/model/TaskState.model'
-import { extractGroupState, latestJob } from '@/utils/tasks'
+import { dtMean, extractGroupState, latestJob } from '@/utils/tasks'
 
 describe('tasks', () => {
   describe('extractGroupState', () => {
@@ -90,4 +90,65 @@ describe('tasks', () => {
       })
     })
   })
+  describe('dtMean', () => {
+    it('should format seconds to nice isodatetime format', () => {
+      const tests = [
+        {
+          taskNode: { node: null },
+          expected: undefined
+        },
+        {
+          taskNode: {
+            task: {
+              meanElapsedTime: 0
+            }
+          },
+          expected: undefined
+        },
+        {
+          taskNode: {
+            node: {
+              task: {
+                meanElapsedTime: 84
+              }
+            }
+          },
+          expected: '00:01:24'
+        },
+        {
+          taskNode: {
+            node: {
+              task: {
+                meanElapsedTime: 42
+              }
+            }
+          },
+          expected: '00:00:42'
+        },
+        {
+          taskNode: {
+            node: {
+              task: {
+                meanElapsedTime: 4242
+              }
+            }
+          },
+          expected: '01:10:42'
+        },
+        {
+          taskNode: {
+            node: {
+              task: {
+                meanElapsedTime: 1426332
+              }
+            }
+          },
+          expected: '16d 12:12:12'
+        }
+      ]
+      tests.forEach(test => {
+        expect(dtMean(test.taskNode)).to.equal(test.expected)
+      })
+    })
+  })
 })