Merge pull request #347 from hubmapconsortium/cell-count-fix

Cell count fix

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
         npx nx affected --target=test --parallel=3 --ci --code-coverage
         npx nx affected --target=test-doc-coverage --parallel=3
         npx nx affected --target=build --parallel=3
-      main-branch-name: develop
+      main-branch-name: ${{ github.base_ref || github.ref_name }}
 
   agents:
     name: Nx Cloud - Agents

.gitignore

@@ -39,4 +39,5 @@ testem.log
 Thumbs.db
 
 .angular
+.nx
 env/

libs/state/src/lib/cell-summary/cell-summary.helpers.ts

@@ -1,5 +1,5 @@
 import { CellSummary } from '@hra-ui/services';
-import { CellSummaryAggregate, CellSummaryAggregateRow } from './cell-summary.model';
+import { CellSummaryAggregate, CellSummaryAggregateCell, CellSummaryAggregateRow } from './cell-summary.model';
 
 /**
  * This function gets the index of the column if it does not have any
@@ -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] = row.find((item): item is CellSummaryAggregateCell => typeof item === 'object')?.data.count;
   }
 
   const columns = Array.from(columnIndexByBiomarker.keys()).map((id) => getLabel(biomarkers, id, 'biomarker'));

libs/state/src/lib/cell-summary/cell-summary.model.ts

@@ -2,6 +2,9 @@ import { CellSummary, FtuDataSchemas } from '@hra-ui/services';
 import { StateContext } from '@ngxs/store';
 import { z } from 'zod';
 
+/** Single aggregate cell */
+export type CellSummaryAggregateCell = z.infer<typeof AGGREGATE_CELL>;
+
 /** Type representing a single AGGREGATE_ROW */
 export type CellSummaryAggregateRow = z.infer<typeof AGGREGATE_ROW>;