Enhance computePivot function to filter out records with undefined values in both row and column fields, and update tests to verify correct handling of such cases and row total calculations.

Author: Dylan Huang

vite-app/src/util/pivot.test.ts

@@ -325,6 +325,58 @@ describe('computePivot', () => {
     expect(res.grandTotal).toBe(1)
   })
 
+  it('skips records with undefined column field values', () => {
+    type LooseRow = {
+      region: string
+      rep?: string
+      product?: string
+      amount?: number | string
+    }
+
+    const mixed: LooseRow[] = [
+      { region: 'West', rep: 'A', product: 'Widget', amount: 120 },
+      // Missing product should be excluded entirely (no 'undefined' column)
+      { region: 'West', rep: 'B', amount: 90 },
+      { region: 'East', rep: 'B', product: 'Gadget', amount: 10 },
+    ]
+
+    const res = computePivot<LooseRow>({
+      data: mixed,
+      rowFields: ['region'],
+      columnFields: ['product'],
+      valueField: 'amount',
+      aggregator: 'sum',
+    })
+
+    // Columns should not contain 'undefined'
+    expect(res.colKeyTuples.map((t) => String(t))).toEqual(['Gadget', 'Widget'])
+
+    const rWest = 'West'
+    const rEast = 'East'
+    const cWidget = 'Widget'
+    const cGadget = 'Gadget'
+
+    // Only valid records contribute
+    expect(res.cells[rWest][cWidget].value).toBe(120)
+    expect(res.cells[rEast][cGadget].value).toBe(10)
+    expect(res.cells[rWest][cGadget]).toBeUndefined()
+  })
+
+  it('row totals use the provided aggregation over row records', () => {
+    const res = computePivot<Row>({
+      data: rows,
+      rowFields: ['region'],
+      columnFields: ['product'],
+      valueField: 'amount',
+      aggregator: 'avg',
+    })
+
+    // East row has values [10, 200] => avg 105
+    expect(res.rowTotals['East']).toBe(105)
+    // West row has values [90, 120] => avg 105
+    expect(res.rowTotals['West']).toBe(105)
+  })
+
   it("test_flaky_passes_sometimes", () => {
     // read logs.json from data/logs.json
     const logsUrl = new URL('../../data/logs.jsonl', import.meta.url)

vite-app/src/util/pivot.ts

@@ -248,18 +248,19 @@ export function computePivot<T extends Record<string, unknown>>({
   // Apply filter first if provided
   const filteredData = filter ? data.filter(filter) : data;
 
-  // Filter out records that do not have defined values for all rowFields.
-  // This avoids creating a row key of "undefined" and ensures such records
-  // are not returned as part of the cells/row totals.
-  const dataWithDefinedRows = filteredData.filter((rec) =>
-    rowFields.every((f) => rec[f] !== undefined)
+  // Filter out records that do not have defined values for all rowFields and columnFields.
+  // This avoids creating a row or column key of "undefined" and ensures such records
+  // are not returned as part of the cells/totals.
+  const dataWithDefinedKeys = filteredData.filter((rec) =>
+    rowFields.every((f) => rec[f] !== undefined) &&
+    columnFields.every((f) => rec[f] !== undefined)
   );
   const rowKeyTuples: unknown[][] = [];
   const rowKeySet = new Set<string>();
   const colKeyTuples: unknown[][] = [];
   const colKeySet = new Set<string>();
 
-  for (const rec of dataWithDefinedRows) {
+  for (const rec of dataWithDefinedKeys) {
     const rTuple = getTuple(rec, rowFields);
     const rKey = toKey(rTuple);
     if (!rowKeySet.has(rKey)) {
@@ -295,7 +296,7 @@ export function computePivot<T extends Record<string, unknown>>({
 
   // Partition records per cell
   const cellRecords: Record<string, Record<string, T[]>> = {};
-  for (const rec of dataWithDefinedRows) {
+  for (const rec of dataWithDefinedKeys) {
     const rKey = toKey(getTuple(rec, rowFields));
     const cKey = toKey(getTuple(rec, columnFields));
     if (!cellRecords[rKey]) cellRecords[rKey] = {};
@@ -315,10 +316,27 @@ export function computePivot<T extends Record<string, unknown>>({
       }
       const value = aggregate(values, records, aggregator);
       cells[rKey][cKey] = { value, records };
-      rowTotals[rKey] += value;
     }
   }
 
+  // Calculate row totals using the same aggregation method applied over all records in the row
+  for (const rKey of Object.keys(cells)) {
+    const rowRecords: T[] = [];
+    const rowValues: number[] = [];
+    const cols = cellRecords[rKey] ?? {};
+    for (const cKey of Object.keys(cols)) {
+      const records = cols[cKey];
+      rowRecords.push(...records);
+      if (valueField != null) {
+        for (const rec of records) {
+          const v = getNumber(rec[valueField]);
+          if (v != null) rowValues.push(v);
+        }
+      }
+    }
+    rowTotals[rKey] = aggregate(rowValues, rowRecords, aggregator);
+  }
+
   // Calculate column totals using the same aggregation method
   for (const cKey of Object.keys(colTotals)) {
     const columnRecords: T[] = [];
@@ -344,7 +362,7 @@ export function computePivot<T extends Record<string, unknown>>({
   // non-additive aggregations like "avg").
   let grandTotal: number;
   {
-    const allRecords = dataWithDefinedRows;
+    const allRecords = dataWithDefinedKeys;
     const allValues: number[] = [];
     if (valueField != null) {
       for (const rec of allRecords) {