Merge pull request #1230 from oliver-sanders/5366

store: fix ancestor order
cylc · Feb 20, 2023 · 538c73e · 538c73e
2 parents 330bea5 + 9c2b813
commit 538c73e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -23,6 +23,10 @@ cycle point and family in tree & table views.
 
 ### Fixes
 
+[#1230](https://github.com/cylc/cylc-ui/pull/1230) -
+Fixes an issue where tasks were missing from the GUI in workflows which
+use multi-level family inheritance.
+
 [#1182](https://github.com/cylc/cylc-ui/pull/1182) - Fixes bug in filtering
 by task name.
 

diff --git a/src/services/mock/json/App.json b/src/services/mock/json/App.json
@@ -100,8 +100,8 @@
             {"id": "~user/one//20000102T0000Z/succeeded"}
           ],
           "ancestors": [
-            {"name": "root"},
-            {"name": "GOOD"}
+            {"name": "GOOD"},
+            {"name": "root"}
           ]
         }
       ],

diff --git a/src/store/workflows.module.js b/src/store/workflows.module.js
@@ -358,7 +358,7 @@ function getFamilyTree (tokens, node) {
   }
 
   // add family levels below the cycle point
-  for (const ancestor of node.ancestors || []) {
+  for (const ancestor of node.ancestors.slice().reverse() || []) {
     ret.push([
       'family',
       ancestor.name,

diff --git a/tests/unit/store/workflows.spec.js b/tests/unit/store/workflows.spec.js
@@ -493,8 +493,8 @@ describe('cylc tree', () => {
         id: '~u/w//1/PENGUIN',
         name: 'PENGUIN',
         ancestors: [
-          { name: 'root' },
-          { name: 'ANIMAL' }
+          { name: 'ANIMAL' },
+          { name: 'root' }
         ],
         __typename: 'FamilyProxy'
       }
@@ -661,6 +661,7 @@ describe('cylc tree', () => {
       'workflows/UPDATE',
       {
         id: '~u/w//1/root',
+        ancestors: [],
         __typename: 'FamilyProxy'
       }
     )