#434

frontend/src/components/counts/CountsSummaryResults.tsx

@@ -41,8 +41,8 @@ const CountsSummaryTable = (
   const display = (value: string | number | null, axis: CountsAxis, index: number) =>
       countsSummaryValue (value, axis, index, data, locale)
   const aggregateLabel = (header: CountsPivotHeader) => message (
-      header.kind === 'grand_total' ? (rows.length + cols.length === 1
-          ? 'singleTotal' : 'grandTotal') : 'subtotal').text
+      header.labelKey ?? (header.kind === 'grand_total' ? (rows.length + cols.length === 1
+          ? 'singleTotal' : 'grandTotal') : 'subtotal')).text
   const leading = Math.max (rows.length, cols.length > 0 ? 1 : 0)
   const levels = Math.max (1, cols.length)
   const headingLevels = cols.length === 0 ? 1 : levels * 2
@@ -77,6 +77,8 @@ const CountsSummaryTable = (
   const full = new Map (cells.map (cell => [JSON.stringify (cell.values), cell.count]))
   const totals = new Map ((data.pivotTotals ?? []).map (cell => [
       JSON.stringify ([cell.row, cell.column]), cell.count]))
+  const totalLabels = new Map ((data.pivotTotals ?? []).map (cell => [
+      JSON.stringify ([cell.row, cell.column]), cell.labelKey]))
   const count = (row: CountsPivotHeader, column: CountsPivotHeader) =>
       (row.values.length === rows.length && column.values.length === cols.length)
       ? full.get (JSON.stringify ([...row.values, ...column.values])) ?? 0
@@ -101,16 +103,16 @@ const CountsSummaryTable = (
         ...Array.from ({ length: leading }, (_, index) => labels[index] ?? '')]
   })
   const spans = rowHeaders.map ((row, index) => rows.map ((_, axis) => {
-    if (row.kind !== 'data') return 1
+    if (row.values.length <= axis) return 1
     const prefix = JSON.stringify (row.values.slice (0, axis + 1))
     const previous = rowHeaders[index - 1]
-    if (previous?.kind === 'data'
+    if (previous != null && previous.values.length > axis
         && JSON.stringify (previous.values.slice (0, axis + 1)) === prefix) return 0
     let span = 1
     while (index + span < rowHeaders.length)
     {
       const next = rowHeaders[index + span]
-      if (next.kind !== 'data'
+      if (next.values.length <= axis
           || JSON.stringify (next.values.slice (0, axis + 1)) !== prefix) break
       ++span
     }
@@ -246,8 +248,11 @@ const CountsSummaryTable = (
       <tbody>{rowHeaders.map ((row, index) => <tr key={columnKey (row)}>
         {rowLabels[index].map ((value, offset) => {
           const axis = offset - (numbered ? 1 : 0)
+          if (axis >= 0 && row.kind !== 'data' && axis > row.values.length) return null
+          const aggregate = axis >= 0 && row.kind !== 'data' && axis === row.values.length
           const span = axis < 0 ? 1 : spans[index][axis] ?? 1
           return span === 0 ? null : <td key={offset} rowSpan={span}
+              colSpan={aggregate ? leading - axis : 1}
               role={axis >= 0 ? 'rowheader' : undefined} data-counts-copy={value}
               data-counts-aggregate={row.kind !== 'data' ? '' : undefined}
               data-counts-total={row.kind !== 'data' ? row.kind : undefined}
@@ -264,7 +269,11 @@ const CountsSummaryTable = (
             data-counts-aggregate={(row.kind !== 'data' || column.kind !== 'data')
                 ? '' : undefined}
 	    className="border px-2 py-1 dark:border-slate-700">
-          <PrefetchLink to={drill (row, column)}>{count (row, column)}</PrefetchLink>
+          <PrefetchLink to={drill (row, column)} aria-label={
+              totalLabels.get (JSON.stringify ([row.values, column.values])) == null ? undefined
+              : `${message (totalLabels.get (
+                  JSON.stringify ([row.values, column.values]))!).text}: ${count (row, column)}`}>
+            {count (row, column)}</PrefetchLink>
         </td>)}
       </tr>)}</tbody>
     </CountsSelectableTable>