Natura sort the annotation data type in the side window #3

USCbiostats · Mar 12, 2022 · ffe37ba · ffe37ba
1 parent e287bd2
commit ffe37ba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/src/app/main/apps/annotation/services/annotation.service.ts b/src/app/main/apps/annotation/services/annotation.service.ts
@@ -57,8 +57,6 @@ export class AnnotationService {
                 this.annotationNodes = this._buildAnnotationTree(this.annotations);
                 this.dataSource.data = this.annotationNodes;
                 this.onAnnotationTreeChanged.next(this.annotationNodes);
-
-                console.log(this.annotationNodes)
             });
     }
 

diff --git a/src/app/main/apps/snp/snp-detail/snp-detail.component.ts b/src/app/main/apps/snp/snp-detail/snp-detail.component.ts
@@ -35,7 +35,7 @@ export class SnpDetailComponent implements OnInit, OnDestroy {
         if (!snpRow) {
           return
         }
-        this.rows = this.columnsToRows(snpRow);
+        this.rows = snpRow;
 
       });
   }
@@ -45,19 +45,6 @@ export class SnpDetailComponent implements OnInit, OnDestroy {
     this._unsubscribeAll.complete();
   }
 
-  columnsToRows(snpRow) {
-    const rows = [...Object.keys(snpRow)].map((name) => {
-      const detail = this.annotationService.findDetailByName(name);
-      return {
-        name: name,
-        label: detail.label ? detail.label : name,
-        valueType: detail.value_type,
-        value: snpRow[name]
-      }
-    });
-
-    return rows;
-  }
 
   mapGOids(valueType, value) {
     if (!value) {

diff --git a/src/app/main/apps/snp/snp-table/snp-table.component.ts b/src/app/main/apps/snp/snp-table/snp-table.component.ts
@@ -130,8 +130,16 @@ export class SnpTableComponent implements OnInit {
   }
 
   selectSnp(row) {
-    this.snpService.onSnpChanged.next(row);
-
+    const details = this.snpPage.source.map((key) => {
+      const detail = this.annotationService.findDetailByName(key);
+      return {
+        name: key,
+        label: detail.label ? detail.label : key,
+        valueType: detail.value_type,
+        value: row[key]
+      }
+    });
+    this.snpService.onSnpChanged.next(details);
     this.noctuaMenuService.openRightDrawer();
 
   }