#434

frontend/src/lib/counts.ts

@@ -27,7 +27,7 @@ export type CountsVersion = {
     id: number
     resourceId: number
     versionNo: number
-    isLatest: boolean
+    latest: boolean
     createdAt: string
     createdByUser: { id: number; name: string | null } | null
     title?: string | null
@@ -98,7 +98,7 @@ 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: 'counts:columns.version', is_latest: 'counts:columns.latest',
+    version_no: 'counts:columns.version', 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',
@@ -155,7 +155,7 @@ export const columnsForCounts = (
     definition?: CountsDefinition,
 ): CountColumn[] => definition?.outputFields?.map (field => field.key) ?? [
     ...(resource === 'posts' ? ['thumbnail'] : []),
-    'resource_id', 'version_no', 'is_latest',
+    'resource_id', 'version_no', 'latest',
     ...(resource === 'posts'
         ? ['title', 'url', 'thumbnail_base', 'tags', 'parents', 'video_ms',
            'original_created_from', 'original_created_before']
@@ -326,6 +326,14 @@ export const normaliseCountsParams = (
     definition?: CountsDefinition,
 ): URLSearchParams => {
   const params = new URLSearchParams (source)
+  for (const [key, value] of params)
+  {
+    if (['columns', 'order', 'sort', 'rows', 'cols', 'axis'].includes (key))
+      params.set (key, value.split (' ').map (token =>
+	  token.replace (/^is_latest(?=:|$)/, 'latest')).join (' '))
+    else if (/^(conditions|drill)\.\d+\.field$/.test (key) && value === 'is_latest')
+      params.set (key, 'latest')
+  }
   if (!params.has ('definition'))
     params.set ('definition', params.get ('basis') === 'history' ? 'history' : 'latest')
   if (params.get ('definition') === 'latest' && !params.has ('current'))