Include preparing tasks in submitted task state badge total

Author: MetRonnie

src/components/cylc/TaskStateBadge.vue

@@ -25,7 +25,7 @@
       location="top"
       :open-delay="400"
     >
-      {{ value }} {{ state }} task{{ value > 1 ? 's': '' }}.
+      {{ value }} {{ displayName }} task{{ value > 1 ? 's': '' }}.
       <template v-if="latestTasks.length">
         Latest:
         <span
@@ -41,7 +41,9 @@
 </template>
 
 <script setup>
-defineProps({
+import { computed } from 'vue'
+
+const props = defineProps({
   state: {
     type: String,
     required: true
@@ -59,4 +61,8 @@ defineProps({
     default: 5,
   },
 })
+
+const displayName = computed(
+  () => props.state === 'submitted' ? 'preparing/submitted' : props.state
+)
 </script>

src/components/cylc/tree/GScanTreeItem.vue

@@ -117,12 +117,16 @@ function getStatesInfo (node, stateTotals = {}, latestTasks = {}) {
 
     // the non-zero state totals from this node with all the others from the tree
     for (const state of taskStatesOrdered) {
-      const nodeTotal = node.node.stateTotals[state]
+      let nodeTotal = node.node.stateTotals[state]
+      const nodeLatestTasks = Array.from(node.node.latestStateTasks?.[state] ?? [])
+      if (state === TaskState.SUBMITTED.name) { // include preparing tasks
+        nodeTotal += node.node.stateTotals.preparing
+        nodeLatestTasks.push(...(node.node.latestStateTasks?.preparing ?? []))
+      }
       if (nodeTotal) {
         stateTotals[state] = (stateTotals[state] ?? 0) + nodeTotal
       }
-      const nodeLatestTasks = node.node.latestStateTasks?.[state]
-      if (nodeLatestTasks?.length) {
+      if (nodeLatestTasks.length) {
         latestTasks[state] = [
           ...(latestTasks[state] ?? []),
           ...nodeLatestTasks,

tests/unit/components/cylc/tree/treeitem.vue.spec.js

@@ -152,7 +152,7 @@ describe('GScanTreeItem', () => {
       }
     })
     it('combines all descendant tasks', () => {
-      expect(wrapper.vm.statesInfo.latestTasks.submitted.length).to.equal(10)
+      expect(wrapper.vm.statesInfo.latestTasks.submitted.length).to.equal(20)
       expect(wrapper.vm.statesInfo.latestTasks.running.length).to.equal(10)
     })
     it('combines all descendant task totals', () => {