Merge pull request #95 from Integrative-Transcriptomics/dev

Dev

Author: mwittep

.gitignore

@@ -50,3 +50,5 @@ src/test/GenomeViewerWrapper.jsx
 src/test/Result.jsx
 src/test/SharedGoslingFunctions.js
 src/test/SingleGenomeViz.jsx
+server_tsspredator/exampleData/saureus/saureus_config.json
+server_tsspredator/redisdb/dump-tsspredator.rdb

src/components/Result.jsx

@@ -75,37 +75,44 @@ function Result() {
     let IDofSelectableColumns = []
     const isGenomeComparison = headers.indexOf("Genome") !== -1 
     let tmpMetadataColumns = {}
+    let removedHeaders = [];
     let col = headers.map((h, i) => {
       if (!isGenomeComparison) {
         if (["Pos", "Strand"].includes(h)) {
-          return null;
+          removedHeaders.push(i)
         }
         if (["SuperPos", "SuperStrand"].includes(h)) {
           // Remove "Super" prefix
           h = h.replace("Super", "");
         }
       }
       if (selectHeaders.includes(h)) {
-        IDofSelectableColumns.push(i)
+        IDofSelectableColumns.push(i-removedHeaders.length)
       }
       let filterVariant = getFilterType(h)
       return {
         header: h,
-        accessorKey: i.toString(),
+        accessorKey: (i - removedHeaders.length).toString(),
         meta: {
           filterVariant: filterVariant,
         },
         filterFn: filterVariant === "range" ? 'inNumberRange' : filterVariant === "select" ? 'arrIncludesSome' : filterVariant === "none" ? 'none' : 'includesString',
         sortingFn: h.startsWith("rep") ? "myReplicateSorting" : cappedValues.includes(h) ? "myCappedSorting" : sortingFns.alphanumeric
       };
     });
-    col = col.filter((c) => c !== null);
+    col = col.filter((_, i) => !removedHeaders.includes(i));
     const searchFor = isGenomeComparison ? "Genome" : "Condition";
     const genomeIdx = headers.indexOf(searchFor);
 
     const allG = new Set();
     const dataRows = allRows.slice(1).map(row => {
-      const tmp = row.split("\t");
+      let tmp = row.split("\t");
+      if (!isGenomeComparison) {
+        // remove indices of removed headers
+       tmp = tmp.filter((_, i) => {
+          return !removedHeaders.includes(i)
+        })        
+      }
 
       allG.add(tmp[genomeIdx]);
       return tmp.reduce((acc, content, j) => {