#434

frontend/src/components/counts/CountsControls.tsx

@@ -12,11 +12,13 @@ import { Button } from '@/components/ui/button'
 import { countsUseLatest, fieldsForCounts, normaliseCountsParams, readCountSort,
 	 selectedCountChildren, selectedCountColumns } from '@/lib/counts'
 import { countsNestedIsScalar } from '@/lib/countsDisplay'
-import { readCountsJSON, useCountsDefinition } from '@/lib/countsDefinitions'
+import { useCountsDefinition } from '@/lib/countsDefinitions'
 import { useClientMotion } from '@/lib/useClientMotion'
 import { inputClass } from '@/lib/utils'
 import { useUITranslation } from '@/lib/useUITranslation'
 
+import { readCountState, setCountState } from '@/lib/queryState'
+
 import type { ReactNode } from 'react'
 
 import type { CountsResource } from '@/lib/counts'
@@ -59,7 +61,7 @@ const CountsControls = (
       const next = new URLSearchParams (previous)
       const columns = selectedCountColumns (resource, previous, definition)
 	  .filter (column => column !== 'thumbnail')
-      next.set ('columns', (thumbnail ? ['thumbnail', ...columns] : columns).join (','))
+      next.set ('columns', (thumbnail ? ['thumbnail', ...columns] : columns).join (' '))
       return next
     })
   }, [thumbnail, resource, definition])
@@ -79,16 +81,16 @@ const CountsControls = (
   const update = (key: string, value: string) => setDraft (previous => {
     const next = new URLSearchParams (previous)
     if (['rows', 'cols'].includes (key) && next.get ('sort') !== '') next.delete ('sort')
-    next.set (key, value)
+    setCountState (next, key, value)
     if (key !== 'mode') return next
     const resolved = normaliseCountsParams (resource, next, definition)
-    const axes = [...readCountsJSON<unknown[]> (resolved, 'rows', []),
-        ...readCountsJSON<unknown[]> (resolved, 'cols', [])]
+    const axes = [...readCountState<unknown[]> (resolved, 'rows', []),
+        ...readCountState<unknown[]> (resolved, 'cols', [])]
     const allowed = value === 'summary'
         ? ['count', ...axes.map ((_, index) => `a${index}`)]
         : fieldsForCounts (resource, definition).map (field => field.key)
     if (readCountSort (resolved.get ('sort')).some (sort => !allowed.includes (sort.key)
-        && !(value === 'summary' && /^measure_[0-9a-f]+$/.test (sort.key))))
+        && !(value === 'summary' && /^m[0-9]{1,2}$/.test (sort.key))))
       next.delete ('sort')
     return normaliseCountsParams (resource, next, definition)
   })