@sjcrh/proteinpaint-server 2.79.0 → 2.79.1-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.79.0",
+  "version": "2.79.1-1",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -48,7 +48,7 @@
     "@typescript-eslint/eslint-plugin": "^5.60.0",
     "babel-loader": "^8.2.2",
     "esbuild": "^0.19.12",
-    "glob": "^10.4.1",
+    "glob": "^10.4.5",
     "node-watch": "^0.7.1",
     "nodemon": "^2.0.19",
     "prettier": "^2.8.8",

package/routes/termdb.config.js

@@ -59,7 +59,8 @@ function make(q, res, ds, genome) {
     urlTemplates: tdb.urlTemplates,
     title: "title" in ds.cohort ? ds.cohort.title : { text: ds.label },
     hideGroupsTab: ds.cohort.hideGroupsTab,
-    tracks: tdb.tracks
+    tracks: tdb.tracks,
+    hasSampleAncestry: ds.cohort.termdb.hasSampleAncestry
   };
   if (tdb.chartConfigByType)
     c.chartConfigByType = tdb.chartConfigByType;
@@ -221,7 +222,7 @@ function addNonDictionaryQueries(c, ds, genome) {
         width: q.singleCell.data.width,
         height: q.singleCell.data.height,
         plots: q.singleCell.data.plots.map((p) => {
-          return { name: p.name, colorColumn: p.colorColumn.name };
+          return { name: p.name, colorColumns: p.colorColumns.map((c2) => c2.name) };
         })
       }
     };

package/routes/termdb.singlecellSamples.js

@@ -129,12 +129,13 @@ function validateDataNative(D, ds) {
           }
           file2Lines[tsvfile] = (await read_file(tsvfile)).trim().split("\n");
         }
+        const colorColumn = plot.colorColumns.find((c) => c.name == q.colorBy?.[plot.name]) || plot.colorColumns[0];
         const lines = file2Lines[tsvfile];
         const cells = [];
         for (let i = 1; i < lines.length; i++) {
           const l = lines[i].split("	");
           const cellId = lines.length > 3 ? l[0] : void 0, x = Number(l[plot.coordsColumns.x]), y = Number(l[plot.coordsColumns.y]);
-          const category = l[plot.colorColumn?.index] || "";
+          const category = l[colorColumn?.index] || "";
           if (!cellId)
             throw "cell id missing";
           if (!Number.isFinite(x) || !Number.isFinite(y))
@@ -147,7 +148,13 @@ function validateDataNative(D, ds) {
           }
           cells.push(cell);
         }
-        plots.push({ name: plot.name, cells, colorBy: plot.colorColumn?.name, colorMap: plot.colorColumn?.colorMap });
+        plots.push({
+          name: plot.name,
+          cells,
+          colorColumns: plot.colorColumns.map((c) => c.name),
+          colorBy: colorColumn?.name,
+          colorMap: colorColumn?.colorMap
+        });
       }
       if (plots.length == 0) {
         return { nodata: true };