continuation of fix to split family tree issue

Author: markgrahamdawson

src/services/mock/json/workflows/multi.json

@@ -117,6 +117,7 @@
             "id": "~user/other/multi/run2//$namespace|root",
             "name": "root",
             "parents": [],
+            "descendants": ["foo"],
             "childTasks": [
               {
                 "name": "foo",

src/services/mock/json/workflows/one.json

@@ -52,6 +52,7 @@
           "id": "~user/one//$namespace|root",
           "name": "root",
           "parents": [],
+          "descendants": ["BAD", "GOOD", "waiting", "sleepy", "checkpoint"],
           "childTasks": [
             {
               "name": "checkpoint",
@@ -81,12 +82,14 @@
           "__typename": "Family",
           "id": "~user/one//$namespace|BAD",
           "name": "BAD",
+          "firstParent": { "id": "~user/one//$namespace|root", "name": "root"},
           "parents": [
             {
               "name": "root",
               "_typename": "Family"
             }
           ],
+          "descendants": ["GOOD", "failed", "retrying"],
           "childTasks": [
             {
               "name": "failed",
@@ -103,12 +106,14 @@
           "__typename": "Family",
           "id": "~user/one//$namespace|GOOD",
           "name": "GOOD",
+          "firstParent": { "id": "~user/one//$namespace|root", "name": "root"},
           "parents": [
             {
               "name": "root",
               "_typename": "family"
             }
           ],
+          "descendants": ["SUCCEEDED"],
           "childTasks": [],
           "childFamilies": [
             {
@@ -121,12 +126,14 @@
           "__typename": "Family",
           "id": "~user/one//$namespace|SUCCEEDED",
           "name": "SUCCEEDED",
+          "firstParent": { "id": "~user/one//$namespace|GOOD", "name": "GOOD"},
           "parents": [
             {
               "name": "GOOD",
               "_typename": "Family"
             }
           ],
+          "descendants": ["GOOD", "eventually_succeeded", "succeeded"],
           "childTasks": [
             {
               "name": "eventually_succeeded",

src/views/Graph.vue

@@ -200,12 +200,14 @@ fragment JobData on Job {
 fragment FamilyData on Family {
   id
   name
-  parents {
+  firstParent {
+    id
     name
   }
   childFamilies {
     name
   }
+  descendants
 }
 
 fragment AddedDelta on Added {
@@ -433,9 +435,7 @@ export default {
       if (this.familyArrayStore.length) {
         const ret = []
         for (const rootFamily of this.getTree()) {
-          if (Object.keys(this.allParentLookUp).includes(rootFamily.name)) {
-            ret.push(rootFamily)
-          }
+          ret.push(rootFamily)
         }
         return ret
       } else {
@@ -477,31 +477,16 @@ export default {
     allParentLookUp () {
       const lookup = {}
       for (const namespace of this.namespaces) {
-        const indexSearch = Object.values(this.cylcTree.$index).find((node) => {
-          return node.name === namespace.name
-        })
         const array = []
-        if (indexSearch.node.firstParent) {
-          array.push(indexSearch.node.firstParent.name)
-        }
-        // Note this uses firtParent field to avoid issues with branching families
-        let parent = indexSearch.node.firstParent
+        let parent = namespace.node.firstParent
         while (parent) {
-          const indexSearch = Object.values(this.cylcTree.$index).find((node) => {
-            return node.name === parent.name
-          })
-          if (indexSearch.node.firstParent) {
-            array.push(indexSearch.node.firstParent.name)
-            parent = indexSearch.node.firstParent
-          } else {
-            parent = null
-          }
-        }
-        if (array.length) {
-          lookup[namespace.name] = array
+          const childTokens = this.workflows[0].tokens.clone({ cycle: `$namespace|${parent.name}` })
+          const childNode = this.cylcTree.$index[childTokens.id]
+          array.push(childNode.name)
+          parent = childNode.node.firstParent
         }
+        lookup[namespace.name] = array
       }
-      lookup.root = []
       return lookup
     },
     /**
@@ -701,9 +686,13 @@ export default {
         name: 'root',
         children: []
       }
-      const tokens = this.workflows[0].tokens.clone({ cycle: '$namespace|root' })
-      const node = this.cylcTree.$index[tokens.id]
-      return this.getTreeHelper(root, node, counter).children
+      if (this.workflows) {
+        const tokens = this.workflows[0].tokens.clone({ cycle: '$namespace|root' })
+        const node = this.cylcTree.$index[tokens.id]
+        if (node) {
+          return this.getTreeHelper(root, node, counter).children
+        }
+      }
     },
     /**
      * Get a nested object of families
@@ -713,24 +702,26 @@ export default {
      * @returns {Family} nested structure of families
      */
     getTreeHelper (store, node, counter) {
-      if (this.allParentLookUp[node.name]) {
-        let tempItem
-        const isParent = this.collapseFamily.includes(node.name)
-        const isAncestor = this.allParentLookUp[node.name].some(element => {
-          return this.collapseFamily.includes(element)
-        })
-        const disabled = isParent || isAncestor
-        for (const childFamily of node.node.childFamilies) {
-          const childTokens = this.workflows[0].tokens.clone({ cycle: `$namespace|${childFamily.name}` })
+      let tempItem
+      const isParent = this.collapseFamily.includes(node.name)
+      const isAncestor = this.allParentLookUp[node.name].some(element => {
+        return this.collapseFamily.includes(element)
+      })
+      const disabled = isParent || isAncestor
+      for (const childFamily of node.node.descendants) {
+        if (this.namespaces.map((obj) => obj.name).includes(childFamily)) {
+          const childTokens = this.workflows[0].tokens.clone({ cycle: `$namespace|${childFamily}` })
           const childNode = this.cylcTree.$index[childTokens.id]
-          tempItem = {
-            id: counter.next(),
-            name: childFamily.name,
-            children: [],
-            disabled
+          if (childNode.node.firstParent.id === node.id) {
+            tempItem = {
+              id: counter.next(),
+              name: childFamily,
+              children: [],
+              disabled
+            }
+            this.getTreeHelper(tempItem, childNode, counter)
+            store.children.push(tempItem)
           }
-          this.getTreeHelper(tempItem, childNode, counter)
-          store.children.push(tempItem)
         }
       }
       return store

tests/unit/views/graph-utils.js

@@ -65,7 +65,8 @@ const nodeFailed =
       name: 'failed',
       firstParent: {
         id: 'user/one/run1//1/BAD'
-      }
+      },
+      descendants: []
     },
     tokens: {
       cycle: '1'
@@ -78,9 +79,10 @@ const nodeNamespaceRoot =
     name: 'root',
     node: {
       name: 'root',
-      parents: [],
+      firstParent: null,
       childFamilies: [{ name: 'GOOD' }, { name: 'BAD' }],
-      childTasks: [{ name: 'checkpoint' }, { name: 'sleepy' }, { name: 'waiting' }]
+      childTasks: [{ name: 'checkpoint' }, { name: 'sleepy' }, { name: 'waiting' }],
+      descendants: ['GOOD', 'SUCCEEDED', 'BAD', 'checkpoint', 'sleepy', 'waiting', 'retrying', 'failed', 'succeeded', 'eventually_succeeded']
     },
     tokens: { cycle: undefined }
   }
@@ -91,9 +93,10 @@ const nodeNamespaceBad =
     name: 'BAD',
     node: {
       name: 'root',
-      parents: [{ name: 'root' }],
+      firstParent: {id: 'user/one/run1//$namespace|root', name: 'root'},
       childFamilies: [],
-      childTasks: [{ name: 'retrying' }, { name: 'failed' }]
+      childTasks: [{ name: 'retrying' }, { name: 'failed' }],
+      descendants: ['retrying', 'failed']
     },
     tokens: { cycle: undefined }
   }
@@ -104,9 +107,10 @@ const nodeNamespaceGood =
     name: 'GOOD',
     node: {
       name: 'GOOD',
-      parents: [{ name: 'root' }],
+      firstParent: {id: 'user/one/run1//$namespace|root', name: 'root'},
       childFamilies: [{ name: 'SUCCEEDED' }],
-      childTasks: [{ name: 'retrying' }, { name: 'failed' }]
+      childTasks: [{ name: 'succeeded' }, { name: 'eventually_succeeded' }],
+      descendants: ['SUCCEEDED', 'succeeded', 'eventually_succeeded']
     },
     tokens: { cycle: undefined }
   }
@@ -117,9 +121,10 @@ const nodeNamespaceSucceeded =
     name: 'SUCCEEDED',
     node: {
       name: 'GOOD',
-      parents: [{ name: 'GOOD' }],
+      firstParent: {id: 'user/one/run1//$namespace|GOOD', name: 'GOOD'},
       childFamilies: [],
-      childTasks: [{ name: 'succeeded' }, { name: 'eventually_succeeded' }]
+      childTasks: [{ name: 'succeeded' }, { name: 'eventually_succeeded' }],
+      descendants: ['succeeded', 'eventually_succeeded'],      
     },
     tokens: { cycle: undefined }
   }
@@ -130,16 +135,18 @@ const workflows = [
     node: {
       firstParent: {
         id: ''
-      }
+      },
+      descendants: []
     },
     children: [
       {
         id: '~user/one//1',
         tokens: { cycle: 1 },
         node: {
           firstParent: {
-            id: ''
-          }
+            id: '~user/one'
+          },
+          descendants: []
         },
         children: [
           {