#434

frontend/src/lib/counts.ts

@@ -1,7 +1,7 @@
-import { countsFieldLabel } from '@/lib/countsDefinitions'
+import { countsFieldLabel, readCountsJSON } from '@/lib/countsDefinitions'
 import { apiDownload, apiGet } from '@/lib/api'
 
-import type { CountsDefinition } from '@/lib/countsDefinitions'
+import type { CountsAxis, CountsDefinition } from '@/lib/countsDefinitions'
 import type { LocaleCode } from '@/lib/locales'
 import type { TagNameSnapshot } from '@/types'
 
@@ -55,7 +55,13 @@ export type CountsStateTotals = {
     assignments: number | null
     deprecatedTags: number | null
     externalAssignments: number | null }
+export type CountsPivotHeader = { values: (string | number | null)[]
+    kind: 'data' | 'subtotal' | 'grand_total' }
 export type CountsResult = {
+    rowHeaders?: CountsPivotHeader[]
+    columnHeaders?: CountsPivotHeader[]
+    pivotTotals?: { row: (string | number | null)[]; column: (string | number | null)[]
+        count: number }[]
     executionAt?: string
     columnValues?: (string | number | null)[][]
     cells?: { values: (string | number | null)[]; count: number }[]
@@ -83,11 +89,10 @@ export type CountRecord = Record<string, unknown>
 export const countColumns: Record<string, string> = {
     event_type: 'counts:eventType',
     thumbnail: 'counts:columns.thumbnailDisplay', resource_id: 'counts:columns.resourceId',
-    version_no: 'history:version', is_latest: 'counts:columns.latest',
+    version_no: 'counts:columns.version', is_latest: 'counts:columns.latest',
     title: 'counts:columns.postTitle', url: 'counts:columns.postURL',
     thumbnail_base: 'counts:columns.thumbnailURL', tags: 'counts:columns.tags',
     parents: 'shared:labels.parentPosts', video_ms: 'shared:labels.duration',
-    original_created_at: 'shared:labels.originalCreatedAt',
     original_created_from: 'counts:columns.originalFrom',
     original_created_before: 'counts:columns.originalBefore',
     name: 'history:tagName', names: 'counts:columns.names',
@@ -144,7 +149,7 @@ export const columnsForCounts = (
     'resource_id', 'version_no', 'is_latest',
     ...(resource === 'posts'
         ? ['title', 'url', 'thumbnail_base', 'tags', 'parents', 'video_ms',
-           'original_created_at', 'original_created_from', 'original_created_before']
+           'original_created_from', 'original_created_before']
         : (resource === 'tags'
            ? ['name', 'names', 'category', 'aliases', 'parents', 'deprecated']
 	   : (definition?.fields.filter (field => ![
@@ -206,6 +211,7 @@ export const selectedCountColumns = (
     params: URLSearchParams,
     definition?: CountsDefinition,
 ): CountColumn[] => {
+  const resolved = normaliseCountsParams (resource, params, definition)
   const common = ['resource_id', 'version_no', 'event_type', 'user', 'created_at']
   const defaults: Record<CountsResource, string[]> = {
       posts: ['title', 'url', 'tags', 'parents', 'video_ms'],
@@ -214,9 +220,9 @@ export const selectedCountColumns = (
       tag_descriptions: ['language_code', 'body', 'source_language_code'],
       tag_groups: ['name', 'description', 'members'],
       materials: ['url', 'source_kind', 'tag_id'] }
-  const selected = params.has ('columns') ? params.get ('columns')!.split (',')
+  const selected = resolved.has ('columns') ? resolved.get ('columns')!.split (',')
       : [...common, ...defaults[resource]]
-  return orderedCountFields (fieldsForCounts (resource, definition), params)
+  return orderedCountFields (fieldsForCounts (resource, definition), resolved)
       .map (field => field.key as CountColumn).filter (key => selected.includes (key))
 }
 
@@ -281,6 +287,7 @@ export const defaultCountsMode = (definition: string | null): 'summary' | 'detai
 export const normaliseCountsParams = (
     resource: CountsResource,
     source: URLSearchParams,
+    definition?: CountsDefinition,
 ): URLSearchParams => {
   const params = new URLSearchParams (source)
   if (!params.has ('definition'))
@@ -306,6 +313,27 @@ export const normaliseCountsParams = (
     params.set ('columns', columnsForCounts (resource).filter (key => selected.has (key))
 	.join (','))
   }
+  if (params.has ('sort'))
+    params.set ('sort', params.get ('sort')!.split (',')
+        .filter (entry => entry.split (':')[0] !== 'original_created_at').join (','))
+  if (params.has ('order'))
+    params.set ('order', params.get ('order')!.split (',')
+        .filter (key => key !== 'original_created_at').join (','))
+  const defaults = definition?.defaults?.find (entry =>
+      entry.definition === params.get ('definition') && entry.mode === params.get ('mode'))
+  for (const { key, value } of defaults?.params ?? [])
+  {
+    if (params.has (key)) continue
+    if (key === 'sort')
+    {
+      const expected = defaults?.params.find (entry => entry.key === 'rows')?.value
+      const axes = readCountsJSON<CountsAxis[]> (params, 'rows', [])
+      const first = expected == null ? null : (JSON.parse (expected) as CountsAxis[])[0]
+      if (!Array.isArray (axes) || axes[0]?.field !== first?.field
+          || (axes[0]?.grain ?? 'month') !== (first?.grain ?? 'month')) continue
+    }
+    params.set (key, value)
+  }
   return params
 }
 

frontend/src/lib/countsClipboard.ts

@@ -2,7 +2,7 @@ export type CountsClipboard = { text: string; html: string }
 export type CountsClipboardColumn = { label: string; children?: CountsClipboardColumn[] }
 export type CountsClipboardCell = string | CountsClipboardTable
 export type CountsClipboardTable = {
-    columns: CountsClipboardColumn[]; rows: CountsClipboardCell[][] }
+    columns: CountsClipboardColumn[]; rows: CountsClipboardCell[][]; headerRows?: string[][] }
 
 
 const escapeHTML = (value: string): string => value.replace (/[&<>"']/g, character =>
@@ -59,7 +59,8 @@ export const countsClipboard = (
     source: string[][] | CountsClipboardTable,
     headers = false,
 ): CountsClipboard => {
-  const headings = !Array.isArray (source) && headers ? headerRows (source.columns) : []
+  const headings = (!Array.isArray (source) && headers)
+      ? source.headerRows ?? headerRows (source.columns) : []
   const rows = Array.isArray (source) ? source : [...headings, ...dataRows (source)]
   const headingCount = Array.isArray (source) ? (headers ? 1 : 0) : headings.length
   // Excel accepts quoted TSV fields only when delimiters or quotes require them.

frontend/src/lib/countsDefinitions.ts

@@ -17,6 +17,7 @@ export type CountsFieldMetadata = {
     key: string; type: CountsFieldType; nullable: boolean; operators: string[] }
 export type CountsDefinition = {
     fields: CountsFieldMetadata[]
+    defaults?: { definition: string; mode: string; params: { key: string; value: string }[] }[]
     axes: { latest: string[]; history: string[] }
     grains: string[] }
 
@@ -42,7 +43,7 @@ export const countsFilterFields = (
 
 export const countsFieldLabel = (key: string): string => {
   const labels: Record<string, string> = {
-      resource_id: 'columns.resourceId', version_no: 'history:version',
+      resource_id: 'columns.resourceId', version_no: 'columns.version',
       user: 'history:actor', created_at: 'columns.changedAt', name: 'history:name',
       title: 'columns.postTitle', url: 'columns.postURL', thumbnail_base: 'columns.thumbnailURL',
       tags: 'columns.tags', tags_json: 'columns.tags', names: 'columns.names',
@@ -62,11 +63,10 @@ export const countsAxisLabel = (
     locale: LocaleCode,
 ): { text: string; language: string } => {
   const field = translateUIMessage (countsFieldLabel (axis.field), 'counts', locale)
-  if (axis.grain == null || definition.fields.find (item => item.key === axis.field)
-      ?.type !== 'datetime') return field
+  if (definition.fields.find (item => item.key === axis.field)?.type !== 'datetime') return field
   return translateUIMessage ('axisWithGrain', 'counts', locale, {
       field: field.text,
-      grain: translateUIMessage (`grains.${axis.grain}`, 'counts', locale).text })
+      grain: translateUIMessage (`grains.${axis.grain ?? 'month'}`, 'counts', locale).text })
 }
 
 

frontend/src/lib/countsDisplay.ts

@@ -2,7 +2,7 @@ import { fieldsForCounts, orderedCountFields, selectedCountChildren,
 	 sortedCountChildren } from '@/lib/counts'
 import { countsEventTypes } from '@/lib/countsDefinitions'
 import { translateUIMessage } from '@/lib/i18n'
-import { localisedDateString, msToTime, originalCreatedAtString } from '@/lib/utils'
+import { localisedDateString, msToTime } from '@/lib/utils'
 
 import type { CountColumn, CountField, CountRecord,
 	      CountsResource, CountsVersion } from '@/lib/counts'
@@ -34,13 +34,6 @@ export const countsCellText = (
   case 'category':
     return translateUIMessage (`common:categories.${row.category}`, 'counts', locale).text
   case 'video_ms': return row.videoMs == null ? '' : msToTime (row.videoMs)
-  case 'original_created_at':
-    if (timezone !== 'Asia/Tokyo')
-      return translateUIMessage ('sections.range', 'counts', locale, {
-          begin: row.originalCreatedFrom == null ? '' : date (row.originalCreatedFrom),
-          end: row.originalCreatedBefore == null ? '' : date (row.originalCreatedBefore) }).text
-    return originalCreatedAtString (
-	row.originalCreatedFrom ?? null, row.originalCreatedBefore ?? null, locale)
   case 'original_created_from':
   case 'original_created_before':
     {
@@ -314,6 +307,8 @@ export const countsExportLabels = (
   labels.name = translateUIMessage ('history:name', 'counts', locale).text
   for (const event of countsEventTypes)
     labels[`event_type:${event}`] = translateUIMessage (`events.${event}`, 'counts', locale).text
+  labels.subtotal = translateUIMessage ('subtotal', 'counts', locale).text
+  labels.grandTotal = translateUIMessage ('grandTotal', 'counts', locale).text
   labels.bot = translateUIMessage ('bot', 'counts', locale).text
   labels.actorFormat = translateUIMessage ('actorWithId', 'counts', locale, {
       name: '{{name}}', id: '{{id}}' }).text
@@ -376,7 +371,7 @@ export const countsDetailClipboardTable = (
 	  ? undefined : clipboardColumns (
 	  field.children, field.key, params, locale) }))
   if (rowStart != null)
-    columns.unshift ({ label: translateUIMessage ('rowNumbers', 'counts', locale).text,
+    columns.unshift ({ label: translateUIMessage ('rowNumberHeading', 'counts', locale).text,
 	children: undefined })
   return { columns, rows: rows.map ((row, index) => {
     const cells: CountsClipboardCell[] = fields.map (field => field.children == null

frontend/src/lib/countsTableLayout.ts

@@ -6,7 +6,7 @@ export const MAX_COUNT_WIDTH = 2000
 export const defaultCountWidths: Record<string, number> = {
     row_number: 72, thumbnail: 88, resource_id: 88, version_no: 88, is_latest: 104,
     title: 300, url: 300, thumbnail_base: 300, tags: 560, parents: 180,
-    video_ms: 120, original_created_at: 260, original_created_from: 240,
+    video_ms: 120, original_created_from: 240,
     original_created_before: 240, name: 240, names: 480, category: 180,
     aliases: 360, deprecated: 240, user: 200, created_at: 240, group: 240, count: 160,
     period: 200, tag_id: 88, id: 88, versionNo: 88, kind: 140, sections: 260,