fix(Time Series): null check on glyph lookup. fixes #299

IQTLabs · May 6, 2019 · 18c71de · 18c71de
1 parent df008aa
commit 18c71de
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 15 deletions.
diff --git a/src/App.js b/src/App.js
@@ -364,19 +364,19 @@ class App extends Component {
         <div className={classNames({ [style.key]: true, [style.hidden]: datasetCount < 2 }) }>
           <svg width="100%" height="60">
             <g>
-              <g class="viz-isAdded-fixed">
+              <g className="viz-isAdded-fixed">
                 <circle cx="15" cy="15" r="10"/>
               </g>
               <text x="30" y="15">Added</text>
             </g>
             <g>
-              <g class="viz-isChanged-fixed">
+              <g className="viz-isChanged-fixed">
                 <circle cx="100" cy="15" r="10"/>
               </g>
               <text x="115" y="15">Changed</text>
             </g>
             <g>
-              <g class="viz-isRemoved-fixed">
+              <g className="viz-isRemoved-fixed">
                 <circle cx="200" cy="15" r="10"/>
               </g>
               <text x="215" y="15">Removed</text>

diff --git a/src/features/visualization/d3-viz/setup-annotations.js b/src/features/visualization/d3-viz/setup-annotations.js
@@ -187,14 +187,22 @@ const setupAnnotations = ({packedData, annotationRoot}) =>{
 
       const childGlyphs = selectAll(`g.${className("isAdded-fixed")}`)
         .filter((e) =>{
-          const ancestors = e.ancestors();
-          return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          if(e){
+            const ancestors = e.ancestors();
+            return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          }
+          else 
+            return false;
         });
 
       const added = selectAll(`g.${className("isAdded")}`)
         .filter((e) =>{
-          const ancestors = e.ancestors();
-          return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          if(e){
+            const ancestors = e.ancestors();
+            return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          }
+          else 
+            return false;
         });
 
       if(!added.empty()){
@@ -241,14 +249,22 @@ const setupAnnotations = ({packedData, annotationRoot}) =>{
 
       const childGlyphs = selectAll(`g.${className("isChanged-fixed")}`)
         .filter((e) =>{
-          const ancestors = e.ancestors();
-          return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          if(e){
+            const ancestors = e.ancestors();
+            return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          }
+          else 
+            return false;
         });
 
       const changed = selectAll(`g.${className("isChanged")}`)
         .filter((e) =>{
-          const ancestors = e.ancestors();
-          return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          if(e){
+            const ancestors = e.ancestors();
+            return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          }
+          else 
+            return false;
         });
 
       if(!changed.empty()){
@@ -295,14 +311,22 @@ const setupAnnotations = ({packedData, annotationRoot}) =>{
 
       const childGlyphs = selectAll(`g.${className("isRemoved-fixed")}`)
         .filter((e) =>{
-          const ancestors = e.ancestors();
-          return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          if(e){
+            const ancestors = e.ancestors();
+            return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          }
+          else 
+            return false;
         });
 
       const removed = selectAll(`g.${className("isRemoved")}`)
         .filter((e) =>{
-          const ancestors = e.ancestors();
-          return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          if(e){
+            const ancestors = e.ancestors();
+            return ancestors.findIndex( a => datumKey(a) === dk) !== -1;
+          }
+          else 
+            return false;
         });
 
       if(!removed.empty()){