#434

frontend/src/lib/countsDisplay.ts

@@ -12,6 +12,10 @@ import type { CountsAxis, CountsDefinition } from '@/lib/countsDefinitions'
 import type { LocaleCode } from '@/lib/locales'
 
 
+export const countsFieldValue = (row: CountRecord, field: string): unknown =>
+    row[field] ?? row[field.replace (/_([a-z])/g, (_, letter: string) => letter.toUpperCase ())]
+
+
 export const countsCellText = (
     row: CountsVersion,
     column: CountColumn,
@@ -85,8 +89,8 @@ export const countsCSVCell = (
     params: URLSearchParams,
     locale: LocaleCode,
 ): string => {
-  const field = fieldsForCounts (resource).find (field => field.key === column)!
-  if (field.children != null)
+  const field = fieldsForCounts (resource).find (field => field.key === column)
+  if (field?.children != null)
   {
     const rows = countsNestedRows (row, column)
     return JSON.stringify (countsNestedExport (rows, field.children, column, params, locale))
@@ -117,7 +121,7 @@ export const countsLogicalName = (
     field: string,
     locale: LocaleCode,
 ): { text: string; language?: string } => {
-  const value = row[field]
+  const value = countsFieldValue (row, field)
   if (value == null) return { text: '' }
   if (field === 'sections')
     return { text: (countsSectionRanges (value, locale) ?? []).join (
@@ -158,10 +162,8 @@ export const countsNestedOrder = (
     rows: CountRecord[],
     path: string,
     params: URLSearchParams,
-    locale: LocaleCode,
-): CountRecord[] => sortedCountChildren (rows, path, params, (row, key) =>
-    ['languageCode', 'scriptCode'].includes (key)
-    ? countsLogicalName (row, key, locale).text : row[key])
+    _locale: LocaleCode,
+): CountRecord[] => sortedCountChildren (rows, path, params, countsFieldValue)
 
 
 export const countsNestedExport = (
@@ -177,13 +179,11 @@ export const countsNestedExport = (
   if (columns.length === 0) return rows.map (() => ({ }))
   return countsNestedOrder (rows, path, params, locale).map (row =>
       Object.fromEntries (columns.map (field => [
-	  translateUIMessage (field.label, 'counts', locale).text,
+          field.key,
 	  field.children
 	  ? countsNestedExport (row[field.key] as CountRecord[] ?? [], field.children,
 	      `${path}.${field.key}`, params, locale)
-	  : (field.key === 'sections'
-	     ? countsSectionRanges (row[field.key], locale)
-	     : countsLogicalName (row, field.key, locale).text)])))
+          : countsFieldValue (row, field.key)])))
 }
 
 
@@ -238,7 +238,8 @@ export const countsNestedText = (
 	? countsNestedText (row[field.key] as CountRecord[] ?? [], field.children,
 	    `${path}.${field.key}`, params, locale)
 	: countsLogicalName (row, field.key, locale).text
-    return `${translateUIMessage (field.label, 'counts', locale).text}: ${value}`
+    const label = translateUIMessage (field.label, 'counts', locale, field.labelValues).text
+    return `${label}: ${value}`
   }).join (' | ')).join ('\n')
 }
 
@@ -288,7 +289,7 @@ export const countsExportLabels = (
     for (const field of fields)
     {
       labels[aliases[field.key] ?? field.key] = translateUIMessage (
-	  field.label, 'counts', locale).text
+          field.label, 'counts', locale, field.labelValues).text
       if (field.children) visit (field.children)
     }
   }
@@ -328,7 +329,8 @@ const clipboardColumns = (
   const selected = selectedCountChildren (params)
   return orderedCountFields (fields, params, path)
       .filter (field => selected.has (`${path}.${field.key}`))
-      .map (field => ({ label: translateUIMessage (field.label, 'counts', locale).text,
+      .map (field => ({ label: translateUIMessage (
+	  field.label, 'counts', locale, field.labelValues).text,
 	  children: (field.children == null
 	      || countsNestedIsScalar (field.children, `${path}.${field.key}`, params))
 	      ? undefined : clipboardColumns (
@@ -366,7 +368,7 @@ export const countsDetailClipboardTable = (
     rowStart: number | null = null,
 ): CountsClipboardTable => {
   const columns = fields.map (field => ({
-      label: translateUIMessage (field.label, 'counts', locale).text,
+      label: translateUIMessage (field.label, 'counts', locale, field.labelValues).text,
       children: (field.children == null
 	  || countsNestedIsScalar (field.children, field.key, params))
 	  ? undefined : clipboardColumns (