Merge branch 'Adil-dev' of https://github.com/familytree365/nuxt into…

… Adil-dev

pages/pedigree/show.vue

@@ -96,6 +96,10 @@ export default {
         let gedComdata = await this.$axios
           .$get("/api/trees/show", {params})
         this.data = gedComdata
+        if(!this.data.links.length) {
+          console.log('no data found');
+          return;
+        }
         this.data.links = this.data.links
           .map((item) => item.map(childItem => childItem.toString()))
 
@@ -223,7 +227,10 @@ export default {
       })
       // find root node and assign data
       // TODO: [1] - fix find by n.id
-      let root = this.all_nodes.find(n => n.data.id === this.data.start)
+      //suman
+      //let root = this.all_nodes.find(n => n.data.id === this.data.start)
+      let root = this.all_nodes.find((n) => {
+        if(n.data){return n.data.id === this.data.start}})
       root.visible = true
       root.neighbors = []
       root.neighbors = this.getNeighbors(root)
@@ -380,7 +387,10 @@ export default {
       if (node.data.isUnion) return [];
       let u_id = node.data.parent_union;
       if (u_id) {
-        let union = this.all_nodes.find(n => n.data.id === u_id);
+        //let union = this.all_nodes.find(n => n.data.id === u_id);
+//suman
+        let union = this.all_nodes.find((n) => {
+        if(n.data){return n.data.id === u_id}})
         return [union].filter(u => u !== undefined);
       } else return [];
     },
@@ -456,22 +466,22 @@ export default {
 
     getFullDisplayBirthYear(node) {
       let birthYear = ''
-      if (node.data.birth_year) {
+      if (node.data && node.data.birth_year) {
         return node.data.birth_year
       }
 
-      if (node.data.birthday) {
+      if (node.data && node.data.birthday) {
         return this.getBirthYear(node)
       }
     },
 
     getFullDisplayDeathYear(node) {
       let deathYear = ''
-      if (node.data.death_year) {
+      if (node.data && node.data.death_year) {
         return node.data.death_year
       }
 
-      if (node.data.deathday) {
+      if (node.data && node.data.deathday) {
         return this.getDeathYear(node)
       }
     },
@@ -521,7 +531,9 @@ export default {
       // Update the nodes...
       let node = this.g.selectAll('g.node')
         .data(nodes, (d) => {
-          return d.data.id || (d.data.id = ++i);
+          //return d.data.id || (d.data.id = ++i);
+          //suman
+          if(d.data){return d.data.id || (d.data.id = ++i);}
         })
 
       // Enter any new nodes at the parent's previous position.
@@ -547,15 +559,17 @@ export default {
         .attr("dy", "-2")
         .attr("x", 13)
         .attr("text-anchor", "start")
-        .text(d => d.data.name);
+        .text((d) => {if(d.data){return d.data.name}});
+        //.text(d => d.data.name);
+        //suman
       // add birth date and death date as labels
       nodeEnter.append('text')
         .attr("dy", "10")
         .attr("x", 13)
         .attr("text-anchor", "start")
         .text(
           (d) => {
-            if (d.data.isUnion) return;
+            if (d.data && d.data.isUnion) return;
             return (this.getFullDisplayBirthYear(d) || "?") + 
               " - " +
               (this.getFullDisplayDeathYear(d) || "?")
@@ -574,7 +588,9 @@ export default {
 
       // Update the node attributes and style
       nodeUpdate.select('circle.node')
-        .attr('r', d => 10 * !d.data.isUnion)
+        .attr('r', (d) => {if(d.data){10 * !d.data.isUnion}})
+        //.attr('r', d => 10 * !d.data.isUnion)
+        //suman
         .style("fill", (d) => {
           return this.is_extendable(d) ? "lightsteelblue" : "#fff";
         })