#434

frontend/src/lib/countsDisplay.ts

@@ -1,4 +1,5 @@
-import { fieldsForCounts, selectedCountChildren, sortedCountChildren } from '@/lib/counts'
+import { fieldsForCounts, orderedCountFields, selectedCountChildren,
+	 sortedCountChildren } from '@/lib/counts'
 import { translateUIMessage } from '@/lib/i18n'
 import { localisedDateString, msToTime, originalCreatedAtString } from '@/lib/utils'
 
@@ -145,7 +146,8 @@ export const countsNestedExport = (
     locale: LocaleCode,
 ): unknown => {
   const selected = selectedCountChildren (params)
-  const columns = fields.filter (field => selected.has (`${path}.${field.key}`))
+  const columns = orderedCountFields (fields, params, path)
+      .filter (field => selected.has (`${path}.${field.key}`))
   if (columns.length === 0) return rows.map (() => ({ }))
   return countsNestedOrder (rows, path, params, locale).map (row =>
       Object.fromEntries (columns.map (field => [
@@ -167,7 +169,8 @@ export const countsNestedText = (
     locale: LocaleCode,
 ): string => {
   const selected = selectedCountChildren (params)
-  const columns = fields.filter (field => selected.has (`${path}.${field.key}`))
+  const columns = orderedCountFields (fields, params, path)
+      .filter (field => selected.has (`${path}.${field.key}`))
   if (columns.length === 0)
     return `${translateUIMessage ('common:countLabel', 'counts', locale).text}: ${rows.length}`
   return countsNestedOrder (rows, path, params, locale).map (row => columns.map (field => {