#434

frontend/src/lib/counts.ts

@@ -1,5 +1,6 @@
 import { countsFieldLabel } from '@/lib/countsDefinitions'
 import { apiDownload, apiGet } from '@/lib/api'
+import { currentViewingLocale } from '@/lib/locales'
 
 import { readCountState, encodeCountState } from '@/lib/queryState'
 
@@ -61,7 +62,8 @@ export type CountsPivotHeader = { values: (string | number | null)[]
     kind: 'data' | 'subtotal' | 'grand_total'
     depth?: number; axisCount?: number; labelKey?: string | null }
 export type CountsResult = {
-    populationCount?: number
+    populationCount?: number | null
+    populationCountComputed?: boolean
     excludedCount?: number | null
     excludedCountScope?: string
     outputCount?: number | null
@@ -76,6 +78,7 @@ export type CountsResult = {
     columnValues?: (string | number | null)[][]
     cells?: { values: (string | number | null)[]; count: number }[]
     axisLabels?: Record<string, Record<string, string | null>>
+    axisNames?: Record<string, Record<string, Record<string, unknown>>>
     rows?: { field: string; grain?: string }[]
     cols?: { field: string; grain?: string }[]
     count: number
@@ -93,7 +96,9 @@ export type CountsResult = {
     coverage?: { basis: string; exact: boolean
 	postHistoryFrom: string | null; tagHistoryFrom: string | null } }
 export type CountSort = { key: string; direction: 'asc' | 'desc' }
-export type CountField = { key: string; label: string; children?: CountField[] }
+export type CountField = { key: string; label: string; children?: CountField[]
+    labelValues?: Record<string, string>
+    nameLocale?: { code: string; languageCode: string; scriptCode: string } }
 export type CountRecord = Record<string, unknown>
 
 export const countColumns: Record<string, string> = {
@@ -177,7 +182,8 @@ export const fieldsForCounts = (
 	label: (key === 'parents' && resource === 'tags') ? 'tags:parents'
             : (countColumns[key] ?? countsFieldLabel (key)),
 	children: key === 'parents' && resource === 'tags'
-            ? [...(nested.parents ?? []), { key: 'name', label: 'counts:columns.name' }]
+	    ? [...(nested.parents ?? []), { key: 'name', label: 'counts:columns.name' },
+	       { key: 'names', label: 'counts:columns.names', children: nameFields }]
             : nested[key] }))
 
 
@@ -327,6 +333,29 @@ export const normaliseCountsParams = (
     definition?: CountsDefinition,
 ): URLSearchParams => {
   const params = new URLSearchParams (source)
+  if (definition?.nameColumns != null)
+  {
+    const names = definition.nameColumns.map (field => field.key)
+    const current = definition.nameColumns.find (field =>
+	field.nameLocale?.code === currentViewingLocale ())?.key
+    if (resource === 'tags' && params.has ('columns'))
+      params.set ('columns', params.get ('columns')!.split (' ').flatMap (key =>
+	  key === 'names' ? names : [key === 'name' && current != null ? current : key])
+	  .join (' '))
+    if (params.has ('children'))
+    {
+      const selected = params.get ('children')!.split (' ')
+      params.set ('children', selected.flatMap (key => {
+	if (['tags.names', 'parents.names'].includes (key))
+	  return names.map (name => `${key.slice (0, -6)}.${name}`)
+	return key.startsWith ('tags.names.') || key.startsWith ('parents.names.') ? [] : [key]
+      }).join (' '))
+    }
+    if (resource === 'tags' && params.has ('order'))
+      params.set ('order', params.get ('order')!.split (' ').flatMap (key =>
+	  key === 'names' ? names : [key === 'name' && current != null ? current : key])
+	  .join (' '))
+  }
   for (const [key, value] of params)
   {
     if (['columns', 'order', 'sort', 'rows', 'cols', 'axis'].includes (key))
@@ -353,11 +382,11 @@ export const normaliseCountsParams = (
     params.set ('through', params.get ('before')!)
   for (const key of ['basis', 'axis', 'latest', 'grain', 'before', 'summary_columns'])
     params.delete (key)
-  if (params.has ('columns') && ['posts', 'tags'].includes (resource))
+  if (params.has ('columns') && definition != null && ['posts', 'tags'].includes (resource))
   {
     const selected = new Set (params.get ('columns')!.split (' '))
-    params.set ('columns', columnsForCounts (resource).filter (key => selected.has (key))
-	.join (' '))
+    params.set ('columns', columnsForCounts (resource, definition)
+	.filter (key => selected.has (key)).join (' '))
   }
   if (params.has ('sort'))
     params.set ('sort', params.get ('sort')!.split (' ')
@@ -374,7 +403,8 @@ export const normaliseCountsParams = (
     {
       const expected = defaults?.params.find (entry => entry.key === 'rows')?.value
       const axes = readCountState<CountsAxis[]> (params, 'rows', [])
-      const first = expected == null ? null : readCountState<CountsAxis[]> (new URLSearchParams ({ rows: expected }), 'rows', [])[0]
+      const first = expected == null ? null : readCountState<CountsAxis[]> (
+	  new URLSearchParams ({ rows: expected }), 'rows', [])[0]
       if (!Array.isArray (axes) || axes[0]?.field !== first?.field
           || (axes[0]?.grain ?? 'month') !== (first?.grain ?? 'month')) continue
     }