#434

frontend/src/pages/CountsResourcePage.tsx

@@ -20,7 +20,7 @@ import { countsRequestParams, defaultCountsMode, countsExportPayload, fieldsForC
 import { countsExportLabels } from '@/lib/countsDisplay'
 import { CountsDefinitionContext, countsAxisFields, countsAxisLabel,
 	 countsResources, countsFieldLabel,
-	 fetchCountsDefinition, readCountsJSON, useCountsDefinition }
+	 fetchCountsDefinition, useCountsDefinition }
     from '@/lib/countsDefinitions'
 import { countsKeys } from '@/lib/queryKeys'
 import { cn } from '@/lib/utils'
@@ -29,6 +29,8 @@ import useDialogue from '@/lib/dialogues/useDialogue'
 import { useLocale } from '@/lib/useLocale'
 import { useUITranslation } from '@/lib/useUITranslation'
 
+import { setCountState, readCountState } from '@/lib/queryState'
+
 import type { CountsAxis } from '@/lib/countsDefinitions'
 
 import type { CountsResource } from '@/lib/counts'
@@ -44,7 +46,7 @@ const CountsResourceContent = ({ resource }: { resource: CountsResource }) => {
   controlParams.delete ('order')
   controlParams.delete ('row_numbers')
   controlParams.set ('columns', selectedCountColumns (resource, params, definition)
-      .filter (column => column !== 'thumbnail').sort ().join (','))
+      .filter (column => column !== 'thumbnail').sort ().join (' '))
   const request = countsRequestParams (params)
   const [open, setOpen] = useState (false)
   const [sidebarOpen, setSidebarOpen] = useState (false)
@@ -99,10 +101,17 @@ const CountsResourceContent = ({ resource }: { resource: CountsResource }) => {
   }, [canonical, data, isPlaceholderData, params, setParams])
 
 
-  const update = (key: string, value: string) => {
+  const update = (key: string, value: string, extra?: Record<string, string>) => {
     const next = new URLSearchParams (params)
-    if (value || key === 'sort' || key === 'columns') next.set (key, value)
+    if (value || ['sort', 'columns', 'children', 'conditions', 'drill'].includes (key))
+      setCountState (next, key, value)
     else next.delete (key)
+    if (extra != null)
+    {
+      for (const key of [...next.keys ()])
+        if (key === 'measures' || key.startsWith ('measures.')) next.delete (key)
+      for (const [key, value] of Object.entries (extra)) next.set (key, value)
+    }
     if (key === 'sort') next.delete ('page')
     setParams (next)
   }
@@ -113,8 +122,8 @@ const CountsResourceContent = ({ resource }: { resource: CountsResource }) => {
     setExportError (false)
     try
     {
-      const axes = [...readCountsJSON<CountsAxis[]> (params, 'rows', []),
-	  ...readCountsJSON<CountsAxis[]> (params, 'cols', [])]
+      const axes = [...readCountState<CountsAxis[]> (params, 'rows', []),
+	  ...readCountState<CountsAxis[]> (params, 'cols', [])]
       const fields = mode === 'summary' ? [
 	  ...axes.map (axis => ({
                   key: axis.field, label: countsFieldLabel (axis.field) })),
@@ -212,7 +221,7 @@ const CountsResourceContent = ({ resource }: { resource: CountsResource }) => {
 		  displayThumbnail={enabled => {
 		    const columns = selectedCountColumns (resource, params, definition)
 			.filter (column => column !== 'thumbnail')
-		    update ('columns', (enabled ? ['thumbnail', ...columns] : columns).join (','))
+		    update ('columns', (enabled ? ['thumbnail', ...columns] : columns).join (' '))
 		  }}
 		  execute={next => {
 		    if (next.toString () === canonical) void refetch ()
@@ -231,7 +240,11 @@ const CountsResourceContent = ({ resource }: { resource: CountsResource }) => {
 	    {isPending && <p>{label ('shared:messages.loadingEllipsis')}</p>}
 	    {isError && <p role="alert">{label ('common:fetchError')}</p>}
 	    {data != null && <>
-              <p className="my-1 text-xs">{label ('recordTotal', { count: data.count })}</p>
+              <p className="my-1 flex flex-wrap gap-x-3 text-xs">
+                <span>{label ('recordTotal', { count: data.count })}</span>
+                {data.populationCount != null && <span>{label ('total', {
+                    count: data.populationCount })}</span>}
+              </p>
 	      {mode === 'summary' ? <CountsSummaryResults resource={resource}
 		  data={data} params={params}
 		  pending={isPlaceholderData} update={update}/> : (

frontend/src/pages/posts/PostListPage.tsx

@@ -1,3 +1,4 @@
+import { queryRecordParams } from '@/lib/queryState'
 import { useQuery } from '@tanstack/react-query'
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { useLocation } from 'react-router-dom'
@@ -61,7 +62,7 @@ const PostListPage: FC = () => {
 
   const keys = {
       tags: tagsKey, match, page, limit,
-      ...(query.get ('tag_refs') && { tagReferences: query.get ('tag_refs')! }),
+      ...(query.has ('tag_refs') && { tagReferences: new URLSearchParams (queryRecordParams (query, 'tag_refs')).toString () }),
       url: '', title: '', originalCreatedFrom: '', originalCreatedTo: '',
       createdFrom: '', createdTo: '', updatedFrom: '', updatedTo: '',
       order } as const

frontend/src/pages/posts/PostSearchPage.tsx

@@ -1,3 +1,4 @@
+import { queryRecordParams } from '@/lib/queryState'
 import { useQuery } from '@tanstack/react-query'
 import { motion } from 'framer-motion'
 import { useEffect, useMemo, useState } from 'react'
@@ -126,7 +127,7 @@ const PostSearchPage: FC = () => {
 
   const keys: FetchPostsParams = {
       tags: qTags, match: qMatch, page, limit,
-      ...(query.get ('tag_refs') && { tagReferences: query.get ('tag_refs')! }),
+      ...(query.has ('tag_refs') && { tagReferences: new URLSearchParams (queryRecordParams (query, 'tag_refs')).toString () }),
       url: qURL,
       title: qTitle,
       originalCreatedFrom: qOriginalCreatedFrom,