Use correct cell count

hubmapconsortium · Apr 5, 2024 · 2190a71 · 2190a71
1 parent a3d6278
commit 2190a71
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/libs/services/src/lib/ftu-data/ftu-data.impl.ts b/libs/services/src/lib/ftu-data/ftu-data.impl.ts
@@ -371,6 +371,7 @@ export class FtuDataImplService extends FtuDataService {
       const cells = summary.map((entry) => ({
         id: entry.cell_id as Iri,
         label: entry.cell_label,
+        count: entry.count,
       }));
 
       const biomarkers = summary.map((entry) => ({

diff --git a/libs/services/src/lib/ftu-data/ftu-data.mock.ts b/libs/services/src/lib/ftu-data/ftu-data.mock.ts
@@ -103,6 +103,7 @@ const CELL_SUMMARY_DATA: CellSummary[] = Object.values(MOCK_SUMMARIES).map((summ
   cells: summary.entries.map((entry) => ({
     id: entry.cell.id as Iri,
     label: entry.cell.label,
+    count: entry.count,
   })),
   biomarkers: summary.entries.map((entry) => ({
     id: entry.biomarker.id as Iri,

diff --git a/libs/services/src/lib/ftu-data/ftu-data.model.ts b/libs/services/src/lib/ftu-data/ftu-data.model.ts
@@ -48,6 +48,7 @@ export const TISSUE_LIBRARY = z.object({
 export const CELL = z.object({
   id: IRI,
   label: z.string(),
+  count: z.number(),
 });
 
 /** Zod Schema for a BIOMARKER */

diff --git a/libs/state/src/lib/cell-summary/cell-summary.helpers.ts b/libs/state/src/lib/cell-summary/cell-summary.helpers.ts
@@ -74,7 +74,7 @@ export function computeAggregate(summary: CellSummary): CellSummaryAggregate {
 
   for (const [cell, row] of rowsByCell.entries()) {
     row[0] = getLabel(cells, cell, 'cell');
-    row[1] = getTotalCount(row);
+    row[1] = cells.find((celll) => celll.label === getLabel(cells, cell, 'cell'))?.count;
   }
 
   const columns = Array.from(columnIndexByBiomarker.keys()).map((id) => getLabel(biomarkers, id, 'biomarker'));