#434

frontend/src/pages/CountsResourcePage.test.tsx

@@ -26,6 +26,7 @@ const renderPage = (extra = '') => renderWithProviders (<>
 </>, { route: `/ja/counts/posts?mode=details&timezone=UTC${extra}` })
 
 beforeEach (() => {
+  vi.spyOn (HTMLCanvasElement.prototype, 'getContext').mockReturnValue (null)
   fetchCounts.mockReset ().mockResolvedValue (detailResult)
   fetchCountsDefinition.mockReset ().mockResolvedValue (postDefinition)
 })

frontend/src/pages/CountsResourcePage.tsx

@@ -96,6 +96,7 @@ const CountsResourceContent = (
   cacheParams.set ('definition', state ? 'latest' : 'history')
   const [running, setRunning] = useState (false)
   const [runError, setRunError] = useState (false)
+  const [runFailure, setRunFailure] = useState<unknown> (null)
   const [runColumnLimit, setRunColumnLimit] = useState<number | null> (null)
   const pendingRun = useRef<PendingCountsRun | null> (null)
   const applied = useRef (params)
@@ -219,6 +220,7 @@ const CountsResourceContent = (
       if (pendingRun.current !== pending) return
       pendingRun.current = null
       setRunning (false)
+      setRunFailure (failure)
       setRunColumnLimit (tooManyColumns (failure))
       setRunError (true)
     }
@@ -228,6 +230,14 @@ const CountsResourceContent = (
   const waiting = running || (!definitionError && (definition == null
       || pending || fetching || placeholder
       || (!params.has ('execution_at') && !errorFlg)))
+  const failure = runError ? runFailure : queryError
+  const errorBody = isApiError (failure) ? failure.response?.data as {
+      error?: string; max_axes?: number; maxAxes?: number } : undefined
+  const errorCode = errorBody?.error
+  const failureMessage = errorCode === 'too_many_axes'
+      ? label ('axisLimit', { max: errorBody?.maxAxes ?? errorBody?.max_axes ?? '' })
+      : (errorCode === 'private_condition' ? label ('privateCondition')
+          : label ('common:fetchError'))
   const columnLimit = runColumnLimit ?? tooManyColumns (queryError)
 
 
@@ -371,14 +381,14 @@ const CountsResourceContent = (
 	      <p>{label ('columnLimit.title')}</p>
 	      <p>{label ('columnLimit.message', { max: columnLimit })}</p>
 	    </div> : ((definitionError || errorFlg || runError)
-		&& <p role="alert">{label ('common:fetchError')}</p>)}
+		&& <p role="alert">{failureMessage}</p>)}
 	    <div className="relative flex min-h-0 flex-1 flex-col overflow-hidden"
 		aria-busy={waiting}>
 	      <div inert={waiting} className="flex min-h-0 flex-1 flex-col">
 	    {definition != null && data != null && <>
 	      <p className="my-1 flex flex-wrap items-baseline gap-x-2 text-sm">
-		<span>{label ('outputTotal', { value: data.outputCount ?? '—' })}</span>
-		{data.excludedCountScope === 'current_query'
+		<span>{label (resultMode === 'summary' ? 'outputRows' : 'outputTotal', { value: data.outputCount ?? '—' })}</span>
+		{resultMode === 'details' && data.excludedCountScope === 'current_query'
 		    && data.excludedCount != null && data.excludedCount > 0 && (
 		    <span className="text-xs text-slate-500 dark:text-slate-400">
 		      {label ('excludedRecords', { count: data.excludedCount })}</span>)}

frontend/src/pages/help/HelpChangesPage.test.tsx

@@ -22,6 +22,7 @@ vi.mock ('@/lib/useClientBehaviourSettings', () => ({
 
 describe ('Help global edition history', () => {
   beforeEach (() => {
+    window.history.replaceState (null, '', '/ja/help/changes')
     helpFixture.reset ()
     vi.mocked (apiGet).mockResolvedValue ({ locales: [{ code: 'ja', name: '日本語' }] })
   })