fix(app): Fix random infinite loops

NCI-GDC · May 22, 2015 · bbba42f · bbba42f
1 parent a119aa3
commit bbba42f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/app/scripts/components/tables/tableicious.directive.ts b/app/scripts/components/tables/tableicious.directive.ts
@@ -197,7 +197,9 @@ module ngApp.components.tables.directives.tableicious {
 
             $scope.$watch(()=>{
                 return $scope.config.headings.map(function(head){
-                    return head.displayName;
+                    if (head) {
+                        return head.displayName;
+                    }
                 })
             },()=>{
                 $scope.order = this.createOrderArray($scope.config.headings);
@@ -206,7 +208,9 @@ module ngApp.components.tables.directives.tableicious {
 
             $scope.$watch(()=>{
                 return $scope.config.headings.map(function(head:TableiciousColumnDefinition){
-                    return head.hidden;
+                    if (head) {
+                        return head.hidden;
+                    }
                 })
             },()=>{
                 refresh();

diff --git a/app/scripts/components/tables/tables.controllers.ts b/app/scripts/components/tables/tables.controllers.ts
@@ -209,7 +209,7 @@ module ngApp.components.tables.controllers {
     /* @ngInject */
     constructor(private $scope: IGDCTableScope) {
       this.sortingHeadings = _.filter($scope.config.headings, (heading: any) => {
-        return heading.sortable;
+        return heading && heading.sortable;
       });
 
       if ($scope.clientSide) {

diff --git a/app/scripts/components/tables/tables.services.ts b/app/scripts/components/tables/tables.services.ts
@@ -90,7 +90,7 @@ module ngApp.components.tables.services {
             }
             return headings.reduce(function(a,b){
                 function addChildrenOfNode(node){
-                    a.push(node)
+                    a.push(node);
                     if (node.parent) {
                         node.nestingLevel = node.parent.nestingLevel + 1;
                     } else {
@@ -104,7 +104,9 @@ module ngApp.components.tables.services {
                         });
                     }
                 }
-                addChildrenOfNode(b);
+                if (b) {
+                    addChildrenOfNode(b);
+                }
                 return a;
             },[]).map(function(heading){
                 heading.parent = undefined;

diff --git a/app/scripts/search/search.files.table.model.ts b/app/scripts/search/search.files.table.model.ts
@@ -229,6 +229,11 @@ module ngApp.search.models {
           var annotations = _.find(row, (item) => {
             return item.id === "annotations";
           });
+
+          if (!annotations) {
+            return;
+          }
+
           var annotationIds = _.map(annotations.val, (annotation: any) => {
             return annotation.annotation_id;
           });

diff --git a/app/scripts/search/search.participants.table.model.ts b/app/scripts/search/search.participants.table.model.ts
@@ -351,6 +351,11 @@ module ngApp.search.models {
                 var annotations = _.find(row, (item) => {
                     return item.id === "annotations";
                 });
+
+                if (!annotations) {
+                    return;
+                }
+
                 var annotationIds = _.map(annotations.val, (annotation: any) => {
                     return annotation.annotation_id;
                 });