Merge '1.6.x' into 1.6.x-sync

cylc · Jun 14, 2023 · 746e0a9 · 746e0a9
2 parents 45b0729 + 3c78205
commit 746e0a9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.mailmap b/.mailmap
@@ -22,3 +22,4 @@ github-actions[bot]   <[email protected]>
 Carol Barno           <[email protected]>                                      <[email protected]>
 Aaron Cole            <[email protected]>
 Jamie Allen           <[email protected]>           JAllen42                <[email protected]>
+Jamie Allen           <[email protected]>
diff --git a/CHANGES.md b/CHANGES.md
@@ -19,7 +19,7 @@ ones in. -->
 Upgraded Vue and Vuetify frameworks to v3.
 
 -------------------------------------------------------------------------------
-## __cylc-ui-1.6.0 (<span actions:bind='release-date'>Upcoming</span>)__
+## __cylc-ui-1.6.0 (<span actions:bind='release-date'>Released 2023-04-27</span>)__
 
 ### Enhancements
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cylc-ui",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "private": true,
   "license": "GPL-3.0-only",
   "scripts": {

diff --git a/src/components/cylc/table/Table.vue b/src/components/cylc/table/Table.vue
@@ -195,7 +195,7 @@ export default {
           sort: (a, b) => DEFAULT_COMPARATOR(a ?? '', b ?? '')
         },
         {
-          title: 'Job System',
+          title: 'Job Runner',
           key: 'latestJob.node.jobRunnerName',
           sortable: true,
           sort: (a, b) => DEFAULT_COMPARATOR(a ?? '', b ?? '')
@@ -207,25 +207,25 @@ export default {
           sort: (a, b) => DEFAULT_COMPARATOR(a ?? '', b ?? '')
         },
         {
-          title: 'T-submit',
+          title: 'Submit',
           key: 'latestJob.node.submittedTime',
           sortable: true,
           sort: (a, b) => datetimeComparator(a ?? '', b ?? '')
         },
         {
-          title: 'T-start',
+          title: 'Start',
           key: 'latestJob.node.startedTime',
           sortable: true,
           sort: (a, b) => datetimeComparator(a ?? '', b ?? '')
         },
         {
-          title: 'T-finish',
+          title: 'Finish',
           key: 'latestJob.node.finishedTime',
           sortable: true,
           sort: (a, b) => datetimeComparator(a ?? '', b ?? '')
         },
         {
-          title: 'dT-mean',
+          title: 'Run Time',
           key: 'task.node.task.meanElapsedTime',
           sortable: true,
           sort: (a, b) => parseInt(a ?? 0) - parseInt(b ?? 0)

diff --git a/tests/e2e/specs/table.cy.js b/tests/e2e/specs/table.cy.js
@@ -99,11 +99,11 @@ describe('Table view', () => {
         .contains('eventually')
         .should('be.visible')
     })
-    it('displays and sorts dt-mean', () => {
+    it('displays and sorts mean run time', () => {
       cy
         // sort dt-mean ascending
         .get('.c-table')
-        .contains('th', 'dT-mean').as('dTHeader')
+        .contains('th', 'Run Time').as('dTHeader')
         .click()
 
         // check 0 is at the top (1st row, 10th column)
@@ -112,7 +112,7 @@ describe('Table view', () => {
           expect($ele.text().trim()).equal('') // no value sorted first
         })
 
-        // sort ft-mean descending
+        // sort dt-mean descending
         .get('@dTHeader')
         .click()