Merge pull request #2254 from MetRonnie/menu

Display xtrigger task state modifiers in command menu

Author: wxtim

src/components/cylc/commandMenu/Menu.vue

@@ -231,15 +231,12 @@ export default {
           }
         } else {
           ret += upperFirst(this.node.node.state || 'state unknown')
-          if (this.node.node.isHeld) {
-            ret += ' (held)'
-          }
-          if (this.node.node.isQueued) {
-            ret += ' (queued)'
-          }
-          if (this.node.node.isRunahead) {
-            ret += ' (runahead)'
-          }
+          if (this.node.node.isHeld) ret += ' (held)'
+          if (this.node.node.isQueued) ret += ' (queued)'
+          if (this.node.node.isRunahead) ret += ' (beyond runahead limit)'
+          if (this.node.node.isRetry) ret += ' (awaiting retry)'
+          else if (this.node.node.isWallclock) ret += ' (awaiting wallclock)'
+          else if (this.node.node.isXtriggered) ret += ' (awaiting xtrigger)'
           if (this.node.node.flowNums) {
             ret += ` • Flows: ${formatFlowNums(this.node.node.flowNums)}`
           }

src/views/Tree.vue

@@ -187,9 +187,9 @@ fragment TaskProxyData on TaskProxy {
   isHeld
   isQueued
   isRunahead
-  isXtriggered
   isRetry
   isWallclock
+  isXtriggered
   task {
     meanElapsedTime
   }