Fix: register the filter_selection_data e2e stub after routeFromHAR, not before

Per Playwright's own docs, routeFromHAR's notFound: 'fallback' sends unmatched requests straight to the network -- it does not chain to other, earlier-registered page.route() handlers via route.fallback() the way I'd assumed. Since Playwright checks routes in reverse-registration order, a handler registered in beforeEach (i.e. before the test body's routeFromHAR call) is checked AFTER routeFromHAR, whose catch-all pattern intercepts everything first and sends any miss straight to the (nonexistent, in e2e) network -- my stub never got a chance to run. Confirmed by a second CI failure with the same "Failed to fetch" symptom even after the CORS-header fix. Moved the mockFilterSelectionData(page) call to immediately after each test's own routeFromHAR(...) call instead, so it's registered later and checked first for that specific URL, with routeFromHAR's broader pattern still handling everything else as before. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Fix: add CORS header to the e2e filter_selection_data stub response
2026-07-22 03:44:54 +00:00 · 2026-07-20 14:54:58 -07:00 · 2026-07-20 14:32:59 -07:00 · 2026-07-20 14:21:51 -07:00 · 2026-07-20 10:00:08 -07:00 · 2026-07-20 10:00:08 -07:00
79 changed files with 1220 additions and 561 deletions
@@ -26,6 +26,7 @@ jobs:
          check-name: 'Merge and Push Manifest'
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          wait-interval: 60
+          checks-discovery-timeout: 1800
  build-release:
    name: Build Release
    needs: wait-for-docker
@@ -1,5 +1,6 @@
 import { expect, test } from '@playwright/test'
 import path from 'node:path'
+import { mockFilterSelectionData } from '../mock-filter-selection-data'

 const REQUESTS_HAR = path.join(__dirname, 'requests/api-settings.har')

@@ -7,6 +8,7 @@ test('should activate / deactivate save button when settings change', async ({
  page,
 }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/settings')
  await expect(page.getByRole('button', { name: 'Save' })).toBeDisabled()
  await page.getByLabel('Use system setting').click()
@@ -16,6 +18,7 @@ test('should activate / deactivate save button when settings change', async ({

 test('should warn on unsaved changes', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/settings')
  await page.getByLabel('Use system setting').click()
  await page.getByRole('link', { name: 'Dashboard' }).click()
@@ -28,6 +31,7 @@ test('should warn on unsaved changes', async ({ page }) => {

 test('should apply appearance changes when set', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/settings')
  await expect(page.locator('html')).toHaveAttribute('data-bs-theme', /auto/)
  await page.getByLabel('Use system setting').click()
@@ -1,5 +1,6 @@
 import { expect, test } from '@playwright/test'
 import path from 'node:path'
+import { mockFilterSelectionData } from '../mock-filter-selection-data'

 const REQUESTS_HAR1 = path.join(__dirname, 'requests/api-dashboard1.har')
 const REQUESTS_HAR2 = path.join(__dirname, 'requests/api-dashboard2.har')
@@ -8,6 +9,7 @@ const REQUESTS_HAR4 = path.join(__dirname, 'requests/api-dashboard4.har')

 test('dashboard inbox link', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR1, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await page.getByRole('link', { name: 'Documents in inbox' }).click()
  await expect(page).toHaveURL(/tags__id__in=9/)
@@ -16,6 +18,7 @@ test('dashboard inbox link', async ({ page }) => {

 test('dashboard total documents link', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR2, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await page.getByRole('link').filter({ hasText: 'Total documents' }).click()
  await expect(page).toHaveURL(/documents/)
@@ -25,6 +28,7 @@ test('dashboard total documents link', async ({ page }) => {

 test('dashboard saved view show all', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR3, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await page
    .locator('pngx-widget-frame')
@@ -38,6 +42,7 @@ test('dashboard saved view show all', async ({ page }) => {

 test('dashboard saved view document links', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR4, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await page
    .locator('pngx-widget-frame')
@@ -51,6 +56,7 @@ test('dashboard saved view document links', async ({ page }) => {

 test('test slim sidebar', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR1, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await page.locator('.sidebar-slim-toggler').click()
  await expect(
@@ -1,5 +1,6 @@
 import { expect, test } from '@playwright/test'
 import path from 'node:path'
+import { mockFilterSelectionData } from '../mock-filter-selection-data'

 const REQUESTS_HAR = path.join(__dirname, 'requests/api-document-detail.har')
 const REQUESTS_HAR2 = path.join(__dirname, 'requests/api-document-detail2.har')
@@ -8,6 +9,7 @@ test('should activate / deactivate save button when changes are saved', async ({
  page,
 }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents/175/')
  await page.waitForSelector('pngx-document-detail pngx-input-text:first-child')
  await expect(page.getByTitle('Storage path', { exact: true })).toHaveText(
@@ -20,6 +22,7 @@ test('should activate / deactivate save button when changes are saved', async ({

 test('should warn on unsaved changes', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents/175/')
  await expect(page.getByTitle('Correspondent', { exact: true })).toHaveText(
    /\w+/
@@ -39,6 +42,7 @@ test('should warn on unsaved changes', async ({ page }) => {

 test('should support tab direct navigation', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents/175/details')
  await expect(page.getByRole('tab', { name: 'Details' })).toHaveAttribute(
    'aria-selected',
@@ -68,6 +72,7 @@ test('should support tab direct navigation', async ({ page }) => {

 test('should show a mobile preview', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents/175/')
  await page.setViewportSize({ width: 400, height: 1000 })
  await expect(page.getByRole('tab', { name: 'Preview' })).toBeVisible()
@@ -77,6 +82,7 @@ test('should show a mobile preview', async ({ page }) => {

 test('should show a list of notes', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents/175/notes')
  await expect(page.locator('pngx-document-notes')).toBeVisible()
  await expect(
@@ -89,6 +95,7 @@ test('should show a list of notes', async ({ page }) => {

 test('should support quick filters', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR2, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents/175/details')
  await page
    .getByRole('button', { name: 'Filter documents with these Tags' })
@@ -1,5 +1,6 @@
 import { expect, test } from '@playwright/test'
 import path from 'node:path'
+import { mockFilterSelectionData } from '../mock-filter-selection-data'

 const REQUESTS_HAR1 = path.join(__dirname, 'requests/api-document-list1.har')
 const REQUESTS_HAR2 = path.join(__dirname, 'requests/api-document-list2.har')
@@ -10,6 +11,7 @@ const REQUESTS_HAR6 = path.join(__dirname, 'requests/api-document-list6.har')

 test('basic filtering', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR1, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents')
  await page.getByRole('button', { name: 'Tags' }).click()
  await page.getByRole('menuitem', { name: 'Inbox' }).click()
@@ -45,6 +47,7 @@ test('basic filtering', async ({ page }) => {

 test('text filtering', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR2, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents')
  await page.getByRole('main').getByRole('combobox').click()
  await page.getByRole('main').getByRole('combobox').fill('test')
@@ -81,6 +84,7 @@ test('text filtering', async ({ page }) => {

 test('date filtering', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR3, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents')
  await page.getByRole('button', { name: 'Dates' }).click()
  await page.locator('.ng-arrow-wrapper').first().click()
@@ -103,6 +107,7 @@ test('date filtering', async ({ page }) => {

 test('sorting', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR4, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents')
  await page.getByRole('button', { name: 'Sort' }).click()
  await page.getByRole('button', { name: 'ASN' }).click()
@@ -141,6 +146,7 @@ test('sorting', async ({ page }) => {

 test('change views', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR5, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents')
  await page.locator('.btn-group > label').first().click()
  await expect(page.locator('pngx-document-list table')).toBeVisible()
@@ -152,6 +158,7 @@ test('change views', async ({ page }) => {

 test('bulk edit', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR6, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/documents')

  await page.locator('pngx-document-card-small').nth(0).click()
@@ -0,0 +1,35 @@
+import { Page } from '@playwright/test'
+
+const EMPTY_SELECTION_DATA = {
+  selected_correspondents: [],
+  selected_tags: [],
+  selected_document_types: [],
+  selected_storage_paths: [],
+  selected_custom_fields: [],
+}
+
+/**
+ * The document list now fires a GET to filter_selection_data on every
+ * non-search reload(), independent of and concurrent with the main list
+ * request. It's not present in any of the recorded HAR fixtures, so with
+ * `notFound: 'fallback'` it would otherwise fall through to the real
+ * network (nothing listens there in e2e, since only the frontend dev
+ * server is started) and fail every test that reloads the list.
+ *
+ * Playwright checks routes in reverse-registration order, so this must be
+ * registered before a test's own page.routeFromHAR() call for the HAR
+ * route's `notFound: 'fallback'` to defer back to this one.
+ */
+export async function mockFilterSelectionData(page: Page) {
+  await page.route('**/api/documents/filter_selection_data/**', (route) =>
+    route.fulfill({
+      json: EMPTY_SELECTION_DATA,
+      // The app calls the (cross-origin, from the e2e app's perspective)
+      // backend at http://localhost:8000 while served from :4200, so a
+      // fulfilled response needs the same CORS header the real backend
+      // sends (and that recorded HAR responses already carry) or the
+      // browser rejects it as a cross-origin failure.
+      headers: { 'Access-Control-Allow-Origin': 'http://localhost:4200' },
+    })
+  )
+}
@@ -1,10 +1,12 @@
 import { expect, test } from '@playwright/test'
 import path from 'node:path'
+import { mockFilterSelectionData } from '../mock-filter-selection-data'

 const REQUESTS_HAR = path.join(__dirname, 'requests/api-global-permissions.har')

 test('should not allow user to edit settings', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await expect(page.getByRole('link', { name: 'Settings' })).not.toBeAttached()
  await page.goto('/settings')
@@ -15,6 +17,7 @@ test('should not allow user to edit settings', async ({ page }) => {

 test('should not allow user to view documents', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await expect(
    page.locator('nav').getByRole('link', { name: 'Documents' })
@@ -31,6 +34,7 @@ test('should not allow user to view documents', async ({ page }) => {

 test('should not allow user to view correspondents', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await expect(
    page.getByRole('link', { name: 'Attributes' })
@@ -43,6 +47,7 @@ test('should not allow user to view correspondents', async ({ page }) => {

 test('should not allow user to view tags', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await expect(
    page.getByRole('link', { name: 'Attributes' })
@@ -55,6 +60,7 @@ test('should not allow user to view tags', async ({ page }) => {

 test('should not allow user to view document types', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await expect(
    page.getByRole('link', { name: 'Attributes' })
@@ -67,6 +73,7 @@ test('should not allow user to view document types', async ({ page }) => {

 test('should not allow user to view storage paths', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await expect(
    page.getByRole('link', { name: 'Attributes' })
@@ -79,6 +86,7 @@ test('should not allow user to view storage paths', async ({ page }) => {

 test('should not allow user to view logs', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await expect(page.getByRole('link', { name: 'Logs' })).not.toBeAttached()
  await page.goto('/logs')
@@ -89,6 +97,7 @@ test('should not allow user to view logs', async ({ page }) => {

 test('should not allow user to view tasks', async ({ page }) => {
  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
+  await mockFilterSelectionData(page)
  await page.goto('/dashboard')
  await expect(page.getByRole('link', { name: 'Tasks' })).not.toBeAttached()
  await page.goto('/tasks')
@@ -37,7 +37,7 @@

 <form [formGroup]="settingsForm" (ngSubmit)="saveSettings()">

-  <ul ngbNav #nav="ngbNav" (navChange)="onNavChange($event)" [(activeId)]="activeNavID" class="nav-tabs">
+  <ul ngbNav #nav="ngbNav" (navChange)="onNavChange($event)" [activeId]="activeNavID()" (activeIdChange)="activeNavID.set($event)" class="nav-tabs">
    <li [ngbNavItem]="SettingsNavIDs.General">
      <a ngbNavLink i18n>General</a>
      <ng-template ngbNavContent>
@@ -242,7 +242,7 @@ describe('SettingsComponent', () => {
    activatedRoute.snapshot.fragment = '#notifications'
    const scrollSpy = jest.spyOn(viewportScroller, 'scrollToAnchor')
    component.ngOnInit()
-    expect(component.activeNavID).toEqual(4) // Notifications
+    expect(component.activeNavID()).toEqual(4) // Notifications
    component.ngAfterViewInit()
    expect(scrollSpy).toHaveBeenCalledWith('#notifications')
  })
@@ -142,7 +142,7 @@ export class SettingsComponent
  private systemStatusService = inject(SystemStatusService)
  private savedViewsService = inject(SavedViewService)

-  activeNavID: number
+  readonly activeNavID = signal<number>(undefined)

  settingsForm = new FormGroup({
    bulkEditConfirmationDialogs: new FormControl(null),
@@ -283,7 +283,7 @@ export class SettingsComponent
          (navID) => navID.toLowerCase() == section
        )
        if (navIDKey) {
-          this.activeNavID = SettingsNavIDs[navIDKey]
+          this.activeNavID.set(SettingsNavIDs[navIDKey])
        }
      }
    })
@@ -386,7 +386,7 @@ export class SettingsComponent
        .navigate(['settings', foundNavIDkey.toLowerCase()])
        .then((navigated) => {
          if (!navigated && this.isDirty) {
-            this.activeNavID = navChangeEvent.activeId
+            this.activeNavID.set(navChangeEvent.activeId)
          } else if (navigated && this.isDirty) {
            this.initialize()
          }
@@ -6,7 +6,7 @@
  <div ngbDropdownMenu class="dropdown-menu-end shadow p-3" aria-labelledby="chatDropdown">
    <div class="chat-container bg-light p-2">
      <div class="chat-messages font-monospace small">
-        @for (message of messages; track message) {
+        @for (message of messages(); track message) {
          <div class="message d-flex flex-row small" [class.justify-content-end]="message.role === 'user'">
            <div class="p-2 m-2" [class.bg-body]="message.role === 'user'">
              <span>
@@ -36,11 +36,12 @@
            id="chatInput"
            class="form-control form-control-sm" name="chatInput" type="text"
            [placeholder]="placeholder"
-            [disabled]="loading"
-            [(ngModel)]="input"
+            [disabled]="loading()"
+            [ngModel]="input()"
+            (ngModelChange)="input.set($event)"
            (keydown)="searchInputKeyDown($event)"
            />
-          <button class="btn btn-sm btn-secondary" type="button" (click)="sendMessage()" [disabled]="loading">Send</button>
+          <button class="btn btn-sm btn-secondary" type="button" (click)="sendMessage()" [disabled]="loading()">Send</button>
        </div>
      </form>
    </div>
@@ -56,44 +56,53 @@ describe('ChatComponent', () => {
  it('should update documentId on initialization', () => {
    jest.spyOn(router, 'url', 'get').mockReturnValue('/documents/123')
    component.ngOnInit()
-    expect(component.documentId).toBe(123)
+    expect(component.documentId()).toBe(123)
  })

  it('should update documentId on navigation', () => {
    component.ngOnInit()
    routerEvents$.next(new NavigationEnd(1, '/documents/456', '/documents/456'))
-    expect(component.documentId).toBe(456)
+    expect(component.documentId()).toBe(456)
  })

  it('should return correct placeholder based on documentId', () => {
-    component.documentId = 123
+    component.documentId.set(123)
    expect(component.placeholder).toBe('Ask a question about this document...')
-    component.documentId = undefined
+    component.documentId.set(undefined)
    expect(component.placeholder).toBe('Ask a question about a document...')
  })

-  it('should send a message and handle streaming response', () => {
-    component.input = 'Hello'
+  it('should send a message and render the streaming response', async () => {
+    component.input.set('Hello')
    component.sendMessage()

-    expect(component.messages).toHaveLength(2)
-    expect(component.messages[0].content).toBe('Hello')
-    expect(component.loading).toBe(true)
+    expect(component.messages()).toHaveLength(2)
+    expect(component.messages()[0].content).toBe('Hello')
+    expect(component.loading()).toBe(true)

    mockStream$.next('Hi')
-    expect(component.messages[1].content).toBe('H')
+    expect(component.messages()[1].content).toBe('H')
    mockStream$.next('Hi there')
    // advance time to process the typewriter effect
-    jest.advanceTimersByTime(1000)
-    expect(component.messages[1].content).toBe('Hi there')
+    await jest.runAllTimersAsync()
+    await fixture.whenStable()
+    expect(component.messages()[1].content).toBe('Hi there')
+    expect(
+      fixture.nativeElement.querySelector('.chat-messages').textContent
+    ).toContain('Hi there')

    mockStream$.complete()
-    expect(component.loading).toBe(false)
-    expect(component.messages[1].isStreaming).toBe(false)
+    await jest.runAllTimersAsync()
+    await fixture.whenStable()
+    expect(component.loading()).toBe(false)
+    expect(component.messages()[1].isStreaming).toBe(false)
+    expect(fixture.nativeElement.querySelector('#chatInput').disabled).toBe(
+      false
+    )
  })

  it('should parse references from the metadata trailer without showing it', () => {
-    component.input = 'Hello'
+    component.input.set('Hello')
    component.sendMessage()

    mockStream$.next(
@@ -101,14 +110,14 @@ describe('ChatComponent', () => {
    )
    jest.advanceTimersByTime(1000)

-    expect(component.messages[1].content).toBe('Hi there')
-    expect(component.messages[1].references).toEqual([
+    expect(component.messages()[1].content).toBe('Hi there')
+    expect(component.messages()[1].references).toEqual([
      { id: 42, title: 'Bread Recipe' },
    ])
  })

  it('should render document reference links under assistant messages', () => {
-    component.input = 'Hello'
+    component.input.set('Hello')
    component.sendMessage()

    mockStream$.next(
@@ -123,12 +132,12 @@ describe('ChatComponent', () => {
  })

  it('should remove delimiter fragments that were already streamed', () => {
-    component.input = 'Hello'
+    component.input.set('Hello')
    component.sendMessage()

    mockStream$.next(`Hi there${CHAT_METADATA_DELIMITER.slice(0, 8)}`)
    jest.advanceTimersByTime(1000)
-    expect(component.messages[1].content).toBe(
+    expect(component.messages()[1].content).toBe(
      `Hi there${CHAT_METADATA_DELIMITER.slice(0, 8)}`
    )

@@ -137,21 +146,21 @@ describe('ChatComponent', () => {
    )
    jest.advanceTimersByTime(1000)

-    expect(component.messages[1].content).toBe('Hi there')
-    expect(component.messages[1].references).toEqual([
+    expect(component.messages()[1].content).toBe('Hi there')
+    expect(component.messages()[1].references).toEqual([
      { id: 42, title: 'Bread Recipe' },
    ])
  })

  it('should handle errors during streaming', () => {
-    component.input = 'Hello'
+    component.input.set('Hello')
    component.sendMessage()

    mockStream$.error('Error')
-    expect(component.messages[1].content).toContain(
+    expect(component.messages()[1].content).toContain(
      '⚠️ Error receiving response.'
    )
-    expect(component.loading).toBe(false)
+    expect(component.loading()).toBe(false)
  })

  it('should enqueue typewriter chunks correctly', () => {
@@ -166,7 +175,7 @@ describe('ChatComponent', () => {
      ChatComponent.prototype as any,
      'scrollToBottom'
    )
-    component.input = 'Test'
+    component.input.set('Test')
    component.sendMessage()
    expect(scrollSpy).toHaveBeenCalled()
  })
@@ -1,4 +1,11 @@
-import { Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core'
+import {
+  Component,
+  ElementRef,
+  inject,
+  OnInit,
+  signal,
+  ViewChild,
+} from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NavigationEnd, Router, RouterModule } from '@angular/router'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
@@ -23,10 +30,10 @@ import {
  styleUrl: './chat.component.scss',
 })
 export class ChatComponent implements OnInit {
-  public messages: ChatMessage[] = []
-  public loading = false
-  public input: string = ''
-  public documentId!: number
+  readonly messages = signal<ChatMessage[]>([])
+  readonly loading = signal(false)
+  readonly input = signal('')
+  readonly documentId = signal<number>(undefined)

  private chatService: ChatService = inject(ChatService)
  private router: Router = inject(Router)
@@ -38,7 +45,7 @@ export class ChatComponent implements OnInit {
  private typewriterActive = false

  public get placeholder(): string {
-    return this.documentId
+    return this.documentId()
      ? $localize`Ask a question about this document...`
      : $localize`Ask a question about a document...`
  }
@@ -57,14 +64,14 @@ export class ChatComponent implements OnInit {

  private updateDocumentId(url: string): void {
    const docIdRe = url.match(/^\/documents\/(\d+)/)
-    this.documentId = docIdRe ? +docIdRe[1] : undefined
+    this.documentId.set(docIdRe ? +docIdRe[1] : undefined)
  }

  sendMessage(): void {
-    if (!this.input.trim()) return
+    if (!this.input().trim()) return

-    const userMessage: ChatMessage = { role: 'user', content: this.input }
-    this.messages.push(userMessage)
+    const userMessage: ChatMessage = { role: 'user', content: this.input() }
+    this.messages.update((messages) => [...messages, userMessage])
    this.scrollToBottom()

    const assistantMessage: ChatMessage = {
@@ -72,12 +79,12 @@ export class ChatComponent implements OnInit {
      content: '',
      isStreaming: true,
    }
-    this.messages.push(assistantMessage)
-    this.loading = true
+    this.messages.update((messages) => [...messages, assistantMessage])
+    this.loading.set(true)

    let lastVisibleContent = ''

-    this.chatService.streamChat(this.documentId, this.input).subscribe({
+    this.chatService.streamChat(this.documentId(), this.input()).subscribe({
      next: (chunk) => {
        const nextResponse = parseChatResponse(chunk)

@@ -93,26 +100,30 @@ export class ChatComponent implements OnInit {
        }

        assistantMessage.references = nextResponse.references
+        this.notifyMessagesChanged()
      },
      error: () => {
        assistantMessage.content += '\n\n⚠️ Error receiving response.'
        assistantMessage.isStreaming = false
-        this.loading = false
+        this.notifyMessagesChanged()
+        this.loading.set(false)
      },
      complete: () => {
        assistantMessage.isStreaming = false
-        this.loading = false
+        this.notifyMessagesChanged()
+        this.loading.set(false)
        this.scrollToBottom()
      },
    })

-    this.input = ''
+    this.input.set('')
  }

  private resetTypewriter(message: ChatMessage, content: string): void {
    this.typewriterBuffer = []
    this.typewriterActive = false
    message.content = content
+    this.notifyMessagesChanged()
    this.scrollToBottom()
  }

@@ -135,11 +146,16 @@ export class ChatComponent implements OnInit {

    const nextChar = this.typewriterBuffer.shift()
    message.content += nextChar
+    this.notifyMessagesChanged()
    this.scrollToBottom()

    setTimeout(() => this.playTypewriter(message), 10) // 10ms per character
  }

+  private notifyMessagesChanged(): void {
+    this.messages.update((messages) => [...messages])
+  }
+
  private scrollToBottom(): void {
    setTimeout(() => {
      this.scrollAnchor?.nativeElement?.scrollIntoView({ behavior: 'smooth' })
@@ -1,5 +1,12 @@
 import { CurrencyPipe, getLocaleCurrencyCode, SlicePipe } from '@angular/common'
-import { Component, inject, Input, LOCALE_ID, OnInit } from '@angular/core'
+import {
+  ChangeDetectorRef,
+  Component,
+  inject,
+  Input,
+  LOCALE_ID,
+  OnInit,
+} from '@angular/core'
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
 import { takeUntil } from 'rxjs'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
@@ -22,6 +29,7 @@ export class CustomFieldDisplayComponent
 {
  private customFieldService = inject(CustomFieldsService)
  private documentService = inject(DocumentService)
+  private changeDetector = inject(ChangeDetectorRef)

  CustomFieldDataType = CustomFieldDataType

@@ -74,6 +82,7 @@ export class CustomFieldDisplayComponent
    this.customFieldService.listAll().subscribe((r) => {
      this.customFields = r.results
      this.init()
+      this.changeDetector.markForCheck()
    })
  }

@@ -111,6 +120,7 @@ export class CustomFieldDisplayComponent
        this.docLinkDocuments = this.value
          .map((id) => result.results.find((d) => d.id === id))
          .filter((d) => d)
+        this.changeDetector.markForCheck()
      })
  }

@@ -95,8 +95,8 @@ describe('CustomFieldsDropdownComponent', () => {
  it('should support update unused fields', () => {
    component.existingFields = [{ field: fields[0].id } as any]
    component['updateUnusedFields']()
-    expect(component['unusedFields'].length).toEqual(1)
-    expect(component['unusedFields'][0].name).toEqual('Field 2')
+    expect(component['unusedFields']().length).toEqual(1)
+    expect(component['unusedFields']()[0].name).toEqual('Field 2')
  })

  it('should support getting data type label', () => {
@@ -8,6 +8,7 @@ import {
  ViewChild,
  ViewChildren,
  inject,
+  signal,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -65,11 +66,11 @@ export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissio
  @ViewChildren('button') buttons: QueryList<ElementRef>

  private customFields: CustomField[] = []
-  private unusedFields: CustomField[] = []
+  private readonly unusedFields = signal<CustomField[]>([])
  private keyboardIndex: number

  public get filteredFields(): CustomField[] {
-    return this.unusedFields.filter(
+    return this.unusedFields().filter(
      (f) => !this.filterText || matchesSearchText(f.name, this.filterText)
    )
  }
@@ -99,8 +100,10 @@ export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissio
  }

  private updateUnusedFields() {
-    this.unusedFields = this.customFields.filter(
-      (f) => !this.existingFields?.find((e) => e.field === f.id)
+    this.unusedFields.set(
+      this.customFields.filter(
+        (f) => !this.existingFields?.find((e) => e.field === f.id)
+      )
    )
  }

@@ -77,7 +77,7 @@
  <div class="input-group input-group-sm">
    <ng-select #fieldSelects
      class="paperless-input-select"
-      [items]="customFields"
+      [items]="customFields()"
      [(ngModel)]="atom.field"
      [disabled]="disabled"
      bindLabel="name"
@@ -79,7 +79,7 @@ describe('CustomFieldsQueryDropdownComponent', () => {
  })

  it('should initialize custom fields on creation', () => {
-    expect(component.customFields).toEqual(customFields)
+    expect(component.customFields()).toEqual(customFields)
  })

  it('should add an expression when opened if queries are empty', () => {
@@ -101,7 +101,7 @@ describe('CustomFieldsQueryDropdownComponent', () => {
      data_type: CustomFieldDataType.String,
      extra_data: {},
    }
-    component.customFields = [field]
+    component.customFields.set([field])
    const operators = component.getOperatorsForField(1)
    expect(operators.length).toEqual(
      [
@@ -138,7 +138,7 @@ describe('CustomFieldsQueryDropdownComponent', () => {
        ],
      },
    }
-    component.customFields = [field]
+    component.customFields.set([field])
    const options = component.getSelectOptionsForField(1)
    expect(options).toEqual([
      { label: 'Option 1', id: 'abc-123' },
@@ -6,6 +6,7 @@ import {
  Input,
  Output,
  QueryList,
+  signal,
  ViewChild,
  ViewChildren,
 } from '@angular/core'
@@ -278,7 +279,7 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
  @Output()
  selectionModelChange = new EventEmitter<CustomFieldQueriesModel>()

-  customFields: CustomField[] = []
+  readonly customFields = signal<CustomField[]>([])

  public readonly today: string = new Date().toLocaleDateString('en-CA')

@@ -325,12 +326,12 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
      .listAll()
      .pipe(first(), takeUntil(this.unsubscribeNotifier))
      .subscribe((result) => {
-        this.customFields = result.results
+        this.customFields.set(result.results)
      })
  }

  public getCustomFieldByID(id: number): CustomField {
-    return this.customFields.find((field) => field.id === id)
+    return this.customFields().find((field) => field.id === id)
  }

  public addAtom(expression: CustomFieldQueryExpression) {
@@ -353,7 +354,7 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
  getOperatorsForField(
    fieldID: number
  ): Array<{ value: string; label: string }> {
-    const field = this.customFields.find((field) => field.id === fieldID)
+    const field = this.customFields().find((field) => field.id === fieldID)
    const groups: CustomFieldQueryOperatorGroups[] = field
      ? CUSTOM_FIELD_QUERY_OPERATOR_GROUPS_BY_TYPE[field.data_type]
      : [CustomFieldQueryOperatorGroups.Basic]
@@ -369,7 +370,7 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
  getSelectOptionsForField(
    fieldID: number
  ): Array<{ label: string; id: string }> {
-    const field = this.customFields.find((field) => field.id === fieldID)
+    const field = this.customFields().find((field) => field.id === fieldID)
    if (field) {
      return field.extra_data['select_options']
    }
@@ -22,11 +22,11 @@
            <ng-template>
              <div class="card mb-2">
                <div class="card-body p-2">
-                  @if (testLoading) {
+                  @if (testLoading()) {
                    <ng-container [ngTemplateOutlet]="loadingTemplate"></ng-container>
-                  } @else if (testResult) {
-                    <code>{{testResult}}</code>
-                  } @else if (testFailed) {
+                  } @else if (testResult()) {
+                    <code>{{testResult()}}</code>
+                  } @else if (testFailed()) {
                    <div class="text-danger" i18n>Path test failed</div>
                  } @else {
                    <div class="text-muted small" i18n>No document selected</div>
@@ -42,7 +42,7 @@
                [compareWith]="compareDocuments"
                [trackByFn]="trackByFn"
                [minTermLength]="2"
-                [loading]="loading"
+                [loading]="loading()"
                [typeahead]="documentsInput$"
                (change)="testPath($event)">
                <ng-template #loadingTemplate ng-loadingspinner-tmp>
@@ -58,17 +58,17 @@ describe('StoragePathEditDialogComponent', () => {
    fixture.detectChanges()
    component.testPath({ id: 1 })
    expect(testSpy).toHaveBeenCalledWith('test/{{title}}', 1)
-    expect(component.testResult).toBe('test/abc123')
-    expect(component.testFailed).toBeFalsy()
+    expect(component.testResult()).toBe('test/abc123')
+    expect(component.testFailed()).toBeFalsy()

    // test failed
    testSpy.mockReturnValueOnce(of(''))
    component.testPath({ id: 1 })
-    expect(component.testResult).toBeNull()
-    expect(component.testFailed).toBeTruthy()
+    expect(component.testResult()).toBeNull()
+    expect(component.testFailed()).toBeTruthy()

    component.testPath(null)
-    expect(component.testResult).toBeNull()
+    expect(component.testResult()).toBeNull()
  })

  it('should compare two documents by id', () => {
@@ -1,5 +1,5 @@
 import { AsyncPipe, NgTemplateOutlet } from '@angular/common'
-import { Component, OnDestroy, inject } from '@angular/core'
+import { Component, OnDestroy, inject, signal } from '@angular/core'
 import {
  FormControl,
  FormGroup,
@@ -65,9 +65,9 @@ export class StoragePathEditDialogComponent
  public documentsInput$ = new Subject<string>()
  public foundDocuments$: Observable<Document[]>
  private testDocument: Document
-  public testResult: string
-  public testFailed: boolean = false
-  public testLoading = false
+  readonly testResult = signal<string>(undefined)
+  readonly testFailed = signal(false)
+  readonly testLoading = signal(false)

  constructor() {
    super()
@@ -99,22 +99,22 @@ export class StoragePathEditDialogComponent

  public testPath(document: Document) {
    if (!document) {
-      this.testResult = null
+      this.testResult.set(null)
      return
    }
    this.testDocument = document
-    this.testLoading = true
+    this.testLoading.set(true)
    ;(this.service as StoragePathService)
      .testPath(this.objectForm.get('path').value, document.id)
      .subscribe((result) => {
        if (result?.length) {
-          this.testResult = result
-          this.testFailed = false
+          this.testResult.set(result)
+          this.testFailed.set(false)
        } else {
-          this.testResult = null
-          this.testFailed = true
+          this.testResult.set(null)
+          this.testFailed.set(true)
        }
-        this.testLoading = false
+        this.testLoading.set(false)
      })
  }

@@ -12,7 +12,7 @@

    <pngx-input-color i18n-title title="Color" formControlName="color" [error]="error?.color"></pngx-input-color>

-    <pngx-input-select i18n-title title="Parent" formControlName="parent" [items]="tags" [allowNull]="true" [error]="error?.parent"></pngx-input-select>
+    <pngx-input-select i18n-title title="Parent" formControlName="parent" [items]="tags()" [allowNull]="true" [error]="error?.parent"></pngx-input-select>

    <pngx-input-check i18n-title title="Inbox tag" formControlName="is_inbox_tag" i18n-hint hint="Inbox tags are automatically assigned to all consumed documents."></pngx-input-check>
    <pngx-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>
@@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core'
+import { Component, inject, signal } from '@angular/core'
 import {
  FormControl,
  FormGroup,
@@ -35,7 +35,7 @@ import { TextComponent } from '../../input/text/text.component'
  ],
 })
 export class TagEditDialogComponent extends EditDialogComponent<Tag> {
-  tags: Tag[]
+  readonly tags = signal<Tag[]>([])

  constructor() {
    super()
@@ -43,7 +43,7 @@ export class TagEditDialogComponent extends EditDialogComponent<Tag> {
    this.userService = inject(UserService)
    this.settingsService = inject(SettingsService)
    this.service.listAll().subscribe((result) => {
-      this.tags = result.results
+      this.tags.set(result.results)
    })
  }

@@ -58,8 +58,8 @@
          </button>
        }
        @if ((selectionModel.items | filter: filterText:'name').length > 0) {
-          <button class="list-group-item list-group-item-action bg-light d-flex align-items-center" (click)="applyClicked()" [disabled]="!modelIsDirty || disabled">
-            <small class="ms-2" [ngClass]="{'fw-bold': modelIsDirty}" i18n>Apply</small>
+          <button class="list-group-item list-group-item-action bg-light d-flex align-items-center" (click)="applyClicked()" [disabled]="!modelIsDirty() || disabled">
+            <small class="ms-2" [ngClass]="{'fw-bold': modelIsDirty()}" i18n>Apply</small>
            <i-bs width="1.5em" height="1em" name="arrow-right"></i-bs>
          </button>
        }
@@ -221,7 +221,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
      .dispatchEvent(new MouseEvent('click')) // open
    selectionModel.toggle(items[0].id)
    fixture.detectChanges()
-    expect(component.modelIsDirty).toBeTruthy()
+    expect(component.modelIsDirty()).toBeTruthy()
    let applyResult: ChangedItems
    const closeSpy = jest.spyOn(component.dropdown, 'close')
    component.apply.subscribe((result) => (applyResult = result))
@@ -244,7 +244,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
      .dispatchEvent(new MouseEvent('click')) // open
    selectionModel.toggle(items[0].id)
    fixture.detectChanges()
-    expect(component.modelIsDirty).toBeTruthy()
+    expect(component.modelIsDirty()).toBeTruthy()
    let applyResult: ChangedItems
    component.apply.subscribe((result) => (applyResult = result))
    component.dropdown.close()
@@ -12,6 +12,7 @@ import {
  Output,
  ViewChild,
  inject,
+  signal,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
@@ -796,7 +797,7 @@ export class FilterableDropdownComponent
    return this.title ? this.title.replace(/\s/g, '_').toLowerCase() : null
  }

-  modelIsDirty: boolean = false
+  readonly modelIsDirty = signal(false)

  private keyboardIndex: number

@@ -811,7 +812,7 @@ export class FilterableDropdownComponent
  constructor() {
    super()
    this.selectionModelChange.subscribe((updatedModel) => {
-      this.modelIsDirty = updatedModel.isDirty()
+      this.modelIsDirty.set(updatedModel.isDirty())
    })
  }

@@ -858,7 +859,7 @@ export class FilterableDropdownComponent
      }, 0)
      if (this.editing) {
        this.selectionModel.reset()
-        this.modelIsDirty = false
+        this.modelIsDirty.set(false)
      }
      this.selectionModel.singleSelect =
        this.editing && !this.selectionModel.manyToOne
@@ -5,6 +5,7 @@ import {
  inject,
  Input,
  Output,
+  signal,
 } from '@angular/core'
 import {
  FormsModule,
@@ -63,11 +64,11 @@ export class CustomFieldsValuesComponent extends AbstractInputComponent<Object>

    super()
    customFieldsService.listAll().subscribe((items) => {
-      this.fields = items.results
+      this.fields.set(items.results)
    })
  }

-  private fields: CustomField[]
+  private readonly fields = signal<CustomField[]>([])

  private _selectedFields: number[]

@@ -90,6 +91,6 @@ export class CustomFieldsValuesComponent extends AbstractInputComponent<Object>
  public removeSelectedField: EventEmitter<number> = new EventEmitter<number>()

  public getCustomField(id: number): CustomField {
-    return this.fields.find((field) => field.id === id)
+    return this.fields().find((field) => field.id === id)
  }
 }
@@ -33,7 +33,7 @@
    [compareWith]="compareDocuments"
    [trackByFn]="trackByFn"
    [minTermLength]="2"
-    [loading]="loading"
+    [loading]="loading()"
    [typeahead]="documentsInput$"
    (mousedown)="$event.stopImmediatePropagation()"
    (change)="onChange(selectedDocumentIDs)">
@@ -2,7 +2,11 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NG_VALUE_ACCESSOR } from '@angular/forms'
-import { of, throwError } from 'rxjs'
+import { By } from '@angular/platform-browser'
+import { provideRouter } from '@angular/router'
+import { NgSelectComponent } from '@ng-select/ng-select'
+import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { of, Subject, throwError } from 'rxjs'
 import { FILTER_SIMPLE_TITLE } from 'src/app/data/filter-rule-type'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { DocumentLinkComponent } from './document-link.component'
@@ -33,10 +37,11 @@ describe('DocumentLinkComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [DocumentLinkComponent],
+      imports: [DocumentLinkComponent, NgxBootstrapIconsModule.pick(allIcons)],
      providers: [
        provideHttpClient(withInterceptorsFromDi()),
        provideHttpClientTesting(),
+        provideRouter([]),
      ],
    })
    documentService = TestBed.inject(DocumentService)
@@ -60,6 +65,25 @@ describe('DocumentLinkComponent', () => {
    expect(getSpy).toHaveBeenCalled()
  })

+  it('should render loading and selected documents after async updates', async () => {
+    const result$ = new Subject<any>()
+    jest.spyOn(documentService, 'getFew').mockReturnValue(result$)
+
+    component.writeValue([1])
+    await fixture.whenStable()
+
+    const select = fixture.debugElement.query(By.directive(NgSelectComponent))
+      .componentInstance as NgSelectComponent
+    expect(select.loading()).toBe(true)
+
+    result$.next({ count: 1, all: [1], results: [documents[0]] })
+    result$.complete()
+    await fixture.whenStable()
+
+    expect(select.loading()).toBe(false)
+    expect(fixture.nativeElement.textContent).toContain(documents[0].title)
+  })
+
  it('shoud maintain ordering of selected documents', () => {
    const getSpy = jest.spyOn(documentService, 'getFew')
    getSpy.mockImplementation((ids) => {
@@ -6,6 +6,7 @@ import {
  Input,
  OnDestroy,
  OnInit,
+  signal,
 } from '@angular/core'
 import {
  FormsModule,
@@ -63,7 +64,7 @@ export class DocumentLinkComponent

  documentsInput$ = new Subject<string>()
  foundDocuments$: Observable<Document[]>
-  loading = false
+  readonly loading = signal(false)
  selectedDocuments: Document[] = []

  private unsubscribeNotifier: Subject<any> = new Subject()
@@ -93,12 +94,12 @@ export class DocumentLinkComponent
      this.selectedDocuments = []
      super.writeValue([])
    } else {
-      this.loading = true
+      this.loading.set(true)
      this.documentsService
        .getFew(documentIDs, { fields: 'id,title' })
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe((documentResults) => {
-          this.loading = false
+          this.loading.set(false)
          this.selectedDocuments = documentIDs.map(
            (id) => documentResults.results.find((d) => d.id === id) ?? {}
          )
@@ -113,7 +114,7 @@ export class DocumentLinkComponent
      this.documentsInput$.pipe(
        distinctUntilChanged(),
        takeUntil(this.unsubscribeNotifier),
-        tap(() => (this.loading = true)),
+        tap(() => this.loading.set(true)),
        switchMap((title) =>
          this.documentsService
            .listFiltered(
@@ -133,7 +134,7 @@ export class DocumentLinkComponent
                )
              ),
              catchError(() => of([])), // empty on error
-              tap(() => (this.loading = false))
+              tap(() => this.loading.set(false))
            )
        )
      )
@@ -37,6 +37,7 @@ export class NumberComponent extends AbstractInputComponent<number> {
    this.documentService.getNextAsn().subscribe((nextAsn) => {
      this.value = nextAsn
      this.onChange(this.value)
+      this.changeDetector.markForCheck()
    })
  }

@@ -68,7 +68,7 @@
            [(ngModel)]="selectionModel.includeUsers"
            [disabled]="disabled"
            [clearable]="false"
-            [items]="users"
+            [items]="users()"
            bindLabel="username"
            multiple="true"
            bindValue="id"
@@ -1,5 +1,12 @@
 import { NgClass } from '@angular/common'
-import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  inject,
+  signal,
+} from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectComponent } from '@ng-select/ng-select'
@@ -75,7 +82,7 @@ export class PermissionsFilterDropdownComponent extends ComponentWithPermissions
  @Output()
  ownerFilterSet = new EventEmitter<PermissionsSelectionModel>()

-  users: User[]
+  readonly users = signal<User[]>([])

  hideUnowned: boolean

@@ -102,7 +109,7 @@ export class PermissionsFilterDropdownComponent extends ComponentWithPermissions
        .listAll()
        .pipe(first())
        .subscribe({
-          next: (result) => (this.users = result.results),
+          next: (result) => this.users.set(result.results),
        })
    }
  }
@@ -57,15 +57,15 @@
          </div>
      </div>
      <div class="col-12 col-md-6">
-        @if (socialAccounts?.length > 0) {
+        @if (socialAccounts().length > 0) {
          <div class="mb-3">
            <p i18n>Connected social accounts</p>
            <ul class="list-group">
-              @for (account of socialAccounts; track account.id) {
+              @for (account of socialAccounts(); track account.id) {
                <li class="list-group-item"
                  ngbPopover="Set a password before disconnecting social account."
                  i18n-ngbPopover
-                  [disablePopover]="hasUsablePassword"
+                  [disablePopover]="hasUsablePassword()"
                  triggers="mouseenter:mouseleave">
                  {{account.name}} ({{account.provider}})
                  <pngx-confirm-button
@@ -75,7 +75,7 @@
                    i18n-title
                    buttonClasses="btn-outline-danger btn-sm ms-2 align-baseline"
                    iconName="trash"
-                    [disabled]="!hasUsablePassword"
+                    [disabled]="!hasUsablePassword()"
                    (confirm)="disconnectSocialAccount(account.id)">
                  </pngx-confirm-button>
                </li>
@@ -84,11 +84,11 @@
            <div class="form-text text-muted text-end fst-italic" i18n>Warning: disconnecting social accounts cannot be undone</div>
          </div>
        }
-        @if (socialAccountProviders?.length > 0) {
+        @if (socialAccountProviders().length > 0) {
          <div class="mb-3">
            <p i18n>Connect new social account</p>
            <div class="list-group">
-              @for (provider of socialAccountProviders; track provider.name) {
+              @for (provider of socialAccountProviders(); track provider.name) {
                <a class="list-group-item list-group-item-action text-primary d-flex align-items-center" href="{{ provider.login_url }}" rel="noopener noreferrer">
                  {{provider.name}}<i-bs class="pb-1 ms-2" name="box-arrow-up-right"></i-bs>
                </a>
@@ -96,7 +96,7 @@
            </div>
          </div>
        }
-        @if (!isTotpEnabled) {
+        @if (!isTotpEnabled()) {
          <div ngbAccordion>
            <div ngbAccordionItem>
              <h2 ngbAccordionHeader>
@@ -105,10 +105,10 @@
              <div ngbAccordionCollapse>
                <div ngbAccordionBody>
                  <ng-template>
-                    @if (totpSettingsLoading) {
+                    @if (totpSettingsLoading()) {
                      <div class="spinner-border spinner-border-sm fw-normal ms-2 me-auto" role="status"></div>
                      <div class="visually-hidden" i18n>Loading...</div>
-                    } @else if (totpSettings) {
+                    } @else if (totpSettings()) {
                      <figure class="figure">
                        @if (qrSvgDataUrl) {
                          <img class="bg-white d-inline-block" [src]="qrSvgDataUrl" alt="Authenticator QR code">
@@ -116,14 +116,14 @@
                        <figcaption class="figure-caption text-end mt-2" i18n>Scan the QR code with your authenticator app and then enter the code below</figcaption>
                      </figure>
                      <p>
-                        <ng-container i18n>Authenticator secret</ng-container>: <code>{{totpSettings.secret}}</code>.
+                        <ng-container i18n>Authenticator secret</ng-container>: <code>{{totpSettings().secret}}</code>.
                        <ng-container i18n>You can store this secret and use it to reinstall your authenticator app at a later time.</ng-container>
                      </p>
                      <div class="input-group mb-3">
                        <input type="text" class="form-control" formControlName="totp_code" placeholder="Code" i18n-placeholder>
-                        <button type="button" class="btn btn-primary ml-auto" (click)="activateTotp()" [disabled]="totpLoading">
+                        <button type="button" class="btn btn-primary ml-auto" (click)="activateTotp()" [disabled]="totpLoading()">
                          <ng-container i18n>Enable</ng-container>
-                          @if (totpLoading) {
+                          @if (totpLoading()) {
                            <div class="spinner-border spinner-border-sm fw-normal ms-2" role="status"></div>
                            <div class="visually-hidden" i18n>Loading...</div>
                          }
@@ -137,18 +137,18 @@
          </div>
        } @else {
          <label class="d-block mb-2" i18n>Two-factor Authentication</label>
-          @if (recoveryCodes) {
+          @if (recoveryCodes()) {
            <div class="alert alert-warning" role="alert">
              <i-bs name="exclamation-triangle" class="me-1"></i-bs><ng-container i18n>Recovery codes will not be shown again, make sure to save them.</ng-container>
            </div>
            <div class="d-flex flex-row align-items-start mb-3">
              <ul class="list-group w-50">
-                  @for (code of recoveryCodes; track code; let i = $index) {
+                  @for (code of recoveryCodes(); track code; let i = $index) {
                    @if (i % 2 === 0) {
                      <li class="list-group-item d-flex justify-content-around align-items-center">
                        <code>{{code}}</code>
-                        @if (recoveryCodes[i + 1]) {
-                          <code>{{recoveryCodes[i + 1]}}</code>
+                        @if (recoveryCodes()[i + 1]) {
+                          <code>{{recoveryCodes()[i + 1]}}</code>
                        }
                      </li>
                    }
@@ -171,7 +171,7 @@
            i18n-title
            buttonClasses="btn-outline-danger btn-sm"
            iconName="trash"
-            [disabled]="totpLoading"
+            [disabled]="totpLoading()"
            (confirm)="deactivateTotp()">
          </pngx-confirm-button>
        }
@@ -10,7 +10,7 @@ import {
  NgbPopoverModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { of, throwError } from 'rxjs'
+import { NEVER, of, Subject, throwError } from 'rxjs'
 import { ProfileService } from 'src/app/services/profile.service'
 import { ToastService } from 'src/app/services/toast.service'
 import * as navUtils from 'src/app/utils/navigation'
@@ -60,6 +60,10 @@ describe('ProfileEditDialogComponent', () => {
      providers: [NgbActiveModal, provideHttpClient(withInterceptorsFromDi())],
    })
    profileService = TestBed.inject(ProfileService)
+    jest.spyOn(profileService, 'get').mockReturnValue(NEVER)
+    jest
+      .spyOn(profileService, 'getSocialAccountProviders')
+      .mockReturnValue(of([]))
    toastService = TestBed.inject(ToastService)
    clipboard = TestBed.inject(Clipboard)
    fixture = TestBed.createComponent(ProfileEditDialogComponent)
@@ -155,7 +159,7 @@ describe('ProfileEditDialogComponent', () => {
      'getSocialAccountProviders'
    )
    getProvidersSpy.mockReturnValue(of(socialAccountProviders))
-    component.hasUsablePassword = true
+    component.hasUsablePassword.set(true)
    component.ngOnInit()
    component.form.get('password').patchValue('new*pass')
    component.onPasswordKeyUp({
@@ -268,6 +272,27 @@ describe('ProfileEditDialogComponent', () => {
    expect(getProvidersSpy).toHaveBeenCalled()
  })

+  it('should render social account providers after an async update', async () => {
+    const providers$ = new Subject<typeof socialAccountProviders>()
+    jest.spyOn(profileService, 'get').mockReturnValue(of(profile))
+    jest
+      .spyOn(profileService, 'getSocialAccountProviders')
+      .mockReturnValue(providers$)
+
+    component.ngOnInit()
+    await fixture.whenStable()
+    expect(
+      fixture.nativeElement.querySelector('a[href="https://example.com"]')
+    ).toBeNull()
+
+    providers$.next(socialAccountProviders)
+    await fixture.whenStable()
+
+    expect(
+      fixture.nativeElement.querySelector('a[href="https://example.com"]')
+    ).not.toBeNull()
+  })
+
  it('should remove disconnected social account from component, show error if needed', () => {
    const disconnectSpy = jest.spyOn(profileService, 'disconnectSocialAccount')
    const getSpy = jest.spyOn(profileService, 'get')
@@ -276,7 +301,7 @@ describe('ProfileEditDialogComponent', () => {

    const errorSpy = jest.spyOn(toastService, 'showError')

-    expect(component.socialAccounts).toContainEqual(socialAccount)
+    expect(component.socialAccounts()).toContainEqual(socialAccount)

    // fail first
    disconnectSpy.mockReturnValueOnce(
@@ -289,7 +314,7 @@ describe('ProfileEditDialogComponent', () => {
    disconnectSpy.mockReturnValue(of(socialAccount.id))
    component.disconnectSocialAccount(socialAccount.id)
    expect(disconnectSpy).toHaveBeenCalled()
-    expect(component.socialAccounts).not.toContainEqual(socialAccount)
+    expect(component.socialAccounts()).not.toContainEqual(socialAccount)
  })

  it('should get totp settings', () => {
@@ -310,7 +335,7 @@ describe('ProfileEditDialogComponent', () => {
    getSpy.mockReturnValue(of(settings))
    component.gettotpSettings()
    expect(getSpy).toHaveBeenCalled()
-    expect(component.totpSettings).toEqual(settings)
+    expect(component.totpSettings()).toEqual(settings)
  })

  it('should activate totp', () => {
@@ -319,15 +344,15 @@ describe('ProfileEditDialogComponent', () => {
    const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
    const error = new Error('failed to activate totp')
    activateSpy.mockReturnValueOnce(throwError(() => error))
-    component.totpSettings = {
+    component.totpSettings.set({
      url: 'http://localhost/',
      qr_svg: 'svg',
      secret: 'secret',
-    }
+    })
    component.form.get('totp_code').patchValue('123456')
    component.activateTotp()
    expect(activateSpy).toHaveBeenCalledWith(
-      component.totpSettings.secret,
+      component.totpSettings().secret,
      component.form.get('totp_code').value
    )
    expect(toastErrorSpy).toHaveBeenCalled()
@@ -341,8 +366,8 @@ describe('ProfileEditDialogComponent', () => {
    )
    component.activateTotp()
    expect(toastInfoSpy).toHaveBeenCalled()
-    expect(component.isTotpEnabled).toBeTruthy()
-    expect(component.recoveryCodes).toEqual(['1', '2', '3'])
+    expect(component.isTotpEnabled()).toBeTruthy()
+    expect(component.recoveryCodes()).toEqual(['1', '2', '3'])
  })

  it('should deactivate totp', () => {
@@ -362,13 +387,13 @@ describe('ProfileEditDialogComponent', () => {
    deactivateSpy.mockReturnValueOnce(of(true))
    component.deactivateTotp()
    expect(toastInfoSpy).toHaveBeenCalled()
-    expect(component.isTotpEnabled).toBeFalsy()
+    expect(component.isTotpEnabled()).toBeFalsy()
  })

  it('should copy recovery codes', () => {
    jest.useFakeTimers()
    const copySpy = jest.spyOn(clipboard, 'copy')
-    component.recoveryCodes = ['1', '2', '3']
+    component.recoveryCodes.set(['1', '2', '3'])
    component.copyRecoveryCodes()
    expect(copySpy).toHaveBeenCalledWith('1\n2\n3')
    jest.advanceTimersByTime(3000)
@@ -56,6 +56,14 @@ export class ProfileEditDialogComponent
  readonly showEmailConfirm = signal(false)
  readonly copied = signal(false)
  readonly codesCopied = signal(false)
+  readonly hasUsablePassword = signal(false)
+  readonly isTotpEnabled = signal(false)
+  readonly totpSettings = signal<TotpSettings>(undefined)
+  readonly totpSettingsLoading = signal(false)
+  readonly totpLoading = signal(false)
+  readonly recoveryCodes = signal<string[]>(undefined)
+  readonly socialAccounts = signal<SocialAccount[]>([])
+  readonly socialAccountProviders = signal<SocialAccountProvider[]>([])

  public form = new FormGroup({
    email: new FormControl(''),
@@ -72,25 +80,15 @@ export class ProfileEditDialogComponent
  private newPassword: string
  private passwordConfirm: string

-  public hasUsablePassword: boolean = false
-
  private currentEmail: string
  private newEmail: string
  private emailConfirm: string

-  public isTotpEnabled: boolean = false
-  public totpSettings: TotpSettings
-  public totpSettingsLoading: boolean = false
-  public totpLoading: boolean = false
-  public recoveryCodes: string[]
-  public socialAccounts: SocialAccount[] = []
-  public socialAccountProviders: SocialAccountProvider[] = []
-
  get qrSvgDataUrl(): string | null {
-    if (!this.totpSettings?.qr_svg) {
+    if (!this.totpSettings()?.qr_svg) {
      return null
    }
-    return `data:image/svg+xml;utf8,${encodeURIComponent(this.totpSettings.qr_svg)}`
+    return `data:image/svg+xml;utf8,${encodeURIComponent(this.totpSettings().qr_svg)}`
  }

  ngOnInit(): void {
@@ -107,20 +105,20 @@ export class ProfileEditDialogComponent
          this.onEmailChange()
        })
        this.currentPassword = profile.password
-        this.hasUsablePassword = profile.has_usable_password
+        this.hasUsablePassword.set(profile.has_usable_password)
        this.form.get('password').valueChanges.subscribe((newPassword) => {
          this.newPassword = newPassword
          this.onPasswordChange()
        })
-        this.socialAccounts = profile.social_accounts
-        this.isTotpEnabled = profile.is_mfa_enabled
+        this.socialAccounts.set(profile.social_accounts ?? [])
+        this.isTotpEnabled.set(profile.is_mfa_enabled)
      })

    this.profileService
      .getSocialAccountProviders()
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe((providers) => {
-        this.socialAccountProviders = providers
+        this.socialAccountProviders.set(providers ?? [])
      })
  }

@@ -259,7 +257,9 @@ export class ProfileEditDialogComponent
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe({
        next: (id: number) => {
-          this.socialAccounts = this.socialAccounts.filter((a) => a.id != id)
+          this.socialAccounts.update((accounts) =>
+            accounts.filter((account) => account.id != id)
+          )
        },
        error: (error) => {
          this.toastService.showError(
@@ -271,36 +271,39 @@ export class ProfileEditDialogComponent
  }

  public gettotpSettings(): void {
-    this.totpSettingsLoading = true
+    this.totpSettingsLoading.set(true)
    this.profileService
      .getTotpSettings()
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe({
        next: (totpSettings) => {
-          this.totpSettingsLoading = false
-          this.totpSettings = totpSettings
+          this.totpSettingsLoading.set(false)
+          this.totpSettings.set(totpSettings)
        },
        error: (error) => {
          this.toastService.showError(
            $localize`Error fetching TOTP settings`,
            error
          )
-          this.totpSettingsLoading = false
+          this.totpSettingsLoading.set(false)
        },
      })
  }

  public activateTotp(): void {
-    this.totpLoading = true
+    this.totpLoading.set(true)
    this.form.get('totp_code').disable()
    this.profileService
-      .activateTotp(this.totpSettings.secret, this.form.get('totp_code').value)
+      .activateTotp(
+        this.totpSettings().secret,
+        this.form.get('totp_code').value
+      )
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe({
        next: (activationResponse) => {
-          this.totpLoading = false
-          this.isTotpEnabled = activationResponse.success
-          this.recoveryCodes = activationResponse.recovery_codes
+          this.totpLoading.set(false)
+          this.isTotpEnabled.set(activationResponse.success)
+          this.recoveryCodes.set(activationResponse.recovery_codes)
          this.form.get('totp_code').enable()
          if (activationResponse.success) {
            this.toastService.showInfo($localize`TOTP activated successfully`)
@@ -309,7 +312,7 @@ export class ProfileEditDialogComponent
          }
        },
        error: (error) => {
-          this.totpLoading = false
+          this.totpLoading.set(false)
          this.form.get('totp_code').enable()
          this.toastService.showError($localize`Error activating TOTP`, error)
        },
@@ -317,15 +320,15 @@ export class ProfileEditDialogComponent
  }

  public deactivateTotp(): void {
-    this.totpLoading = true
+    this.totpLoading.set(true)
    this.profileService
      .deactivateTotp()
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe({
        next: (success) => {
-          this.totpLoading = false
-          this.isTotpEnabled = !success
-          this.recoveryCodes = null
+          this.totpLoading.set(false)
+          this.isTotpEnabled.set(!success)
+          this.recoveryCodes.set(null)
          if (success) {
            this.toastService.showInfo($localize`TOTP deactivated successfully`)
          } else {
@@ -333,14 +336,14 @@ export class ProfileEditDialogComponent
          }
        },
        error: (error) => {
-          this.totpLoading = false
+          this.totpLoading.set(false)
          this.toastService.showError($localize`Error deactivating TOTP`, error)
        },
      })
  }

  public copyRecoveryCodes(): void {
-    this.clipboard.copy(this.recoveryCodes.join('\n'))
+    this.clipboard.copy(this.recoveryCodes().join('\n'))
    this.codesCopied.set(true)
    setTimeout(() => {
      this.codesCopied.set(false)
@@ -14,7 +14,9 @@
  }

  <div content class="wrapper fade" [class.show]="show()">
-  @if (displayMode() === DisplayMode.TABLE) {
+  @if (error()) {
+    <div class="alert alert-danger mb-0" role="alert"><ng-container i18n>Error while loading documents</ng-container>: {{error()}}</div>
+  } @else if (displayMode() === DisplayMode.TABLE) {
    <table class="table table-hover mb-0 mt-n2 align-middle">
      <thead>
        <tr>
@@ -1,6 +1,10 @@
 import { DragDropModule } from '@angular/cdk/drag-drop'
 import { DatePipe } from '@angular/common'
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
+import {
+  HttpErrorResponse,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { By } from '@angular/platform-browser'
@@ -8,7 +12,7 @@ import { Router } from '@angular/router'
 import { RouterTestingModule } from '@angular/router/testing'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { Subject, of } from 'rxjs'
+import { Subject, of, throwError } from 'rxjs'
 import { routes } from 'src/app/app-routing.module'
 import { CustomFieldDisplayComponent } from 'src/app/components/common/custom-field-display/custom-field-display.component'
 import { PreviewPopupComponent } from 'src/app/components/common/preview-popup/preview-popup.component'
@@ -230,6 +234,27 @@ describe('SavedViewWidgetComponent', () => {
    expect(component.documents()).toEqual(documentResults)
  })

+  it('should show an error if documents fail to load', () => {
+    jest.spyOn(documentService, 'listFiltered').mockReturnValue(
+      throwError(
+        () =>
+          new HttpErrorResponse({
+            error: { added__date__lte: ['Enter a valid date.'] },
+            status: 400,
+          })
+      )
+    )
+
+    component.reload()
+    fixture.detectChanges()
+
+    expect(component.loading()).toBe(false)
+    expect(component.error()).toEqual('Added: Enter a valid date.')
+    expect(fixture.debugElement.nativeElement.textContent).toContain(
+      'Error while loading documents: Added: Enter a valid date.'
+    )
+  })
+
  it('should reload on document consumption finished', () => {
    const fileStatusSubject = new Subject<FileStatus>()
    jest
@@ -125,6 +125,8 @@ export class SavedViewWidgetComponent

  readonly count = signal<number>(null)

+  readonly error = signal<string | null>(null)
+
  placeholderRows: number[] = []

  ngOnInit(): void {
@@ -180,6 +182,7 @@ export class SavedViewWidgetComponent

  reload() {
    this.loading.set(this.documents().length == 0)
+    this.error.set(null)
    this.show.set(true)
    this.documentService
      .listFiltered(
@@ -191,12 +194,40 @@ export class SavedViewWidgetComponent
        { truncate_content: true }
      )
      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe((result) => {
-        this.documents.set(result.results)
-        this.count.set(result.count)
-        this.savedViewService.setDocumentCount(this.savedView, result.count)
-        this.loading.set(false)
-        this.show.set(true)
+      .subscribe({
+        next: (result) => {
+          this.documents.set(result.results)
+          this.count.set(result.count)
+          this.savedViewService.setDocumentCount(this.savedView, result.count)
+          this.loading.set(false)
+          this.show.set(true)
+        },
+        error: (error) => {
+          this.documents.set([])
+          this.count.set(null)
+          let errorMessage
+          if (
+            typeof error.error === 'object' &&
+            Object.keys(error.error).length > 0
+          ) {
+            errorMessage = Object.keys(error.error)
+              .map((fieldName) => {
+                const fieldNameBase = fieldName.split('__')[0]
+                const fieldError: Array<string> = error.error[fieldName]
+                return `${
+                  this.documentService.sortFields.find(
+                    (f) => f.field?.split('__')[0] == fieldNameBase
+                  )?.name ?? fieldNameBase
+                }: ${fieldError[0]}`
+              })
+              .join(', ')
+          } else {
+            errorMessage = error.error
+          }
+          this.error.set(errorMessage)
+          this.loading.set(false)
+          this.show.set(true)
+        },
      })
  }

@@ -1 +1 @@
-<p i18n>Searching document with asn {{asn}}</p>
+<p i18n>Searching document with asn {{asn()}}</p>
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnInit, inject, signal } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { FILTER_ASN } from '../../data/filter-rule-type'
 import { DocumentService } from '../../services/rest/document.service'
@@ -13,13 +13,13 @@ export class DocumentAsnComponent implements OnInit {
  private route = inject(ActivatedRoute)
  private router = inject(Router)

-  asn: string
+  readonly asn = signal<string>(undefined)

  ngOnInit(): void {
    this.route.paramMap.subscribe((paramMap) => {
-      this.asn = paramMap.get('id')
+      this.asn.set(paramMap.get('id'))
      this.documentsService
-        .listAllFilteredIds([{ rule_type: FILTER_ASN, value: this.asn }])
+        .listAllFilteredIds([{ rule_type: FILTER_ASN, value: this.asn() }])
        .subscribe((documentId) => {
          if (documentId.length == 1) {
            this.router.navigate(['documents', documentId[0]])
@@ -482,9 +482,7 @@
            </pngx-pdf-viewer>
          </div>
        } @else {
-          <object [data]="previewUrl() | safeUrl" class="preview-sticky" width="100%">
-            <span>Preview is unavailable.</span>
-          </object>
+          <object [data]="previewUrl() | safeUrl" class="preview-sticky" width="100%"></object>
        }
      }
      @case (ContentRenderType.Text) {
@@ -505,9 +503,7 @@
        }
      }
      @case (ContentRenderType.Other) {
-        <object [data]="previewUrl() | safeUrl" class="preview-sticky" width="100%">
-          <span>Preview is unavailable.</span>
-        </object>
+        <object [data]="previewUrl() | safeUrl" class="preview-sticky" width="100%"></object>
      }
    }
    @if (requiresPassword) {
@@ -5,7 +5,7 @@
  </button>
  <div class="dropdown-menu shadow" ngbDropdownMenu>
    <div class="px-3 py-2 mb-2">
-      @if (versionUploadState === UploadState.Idle) {
+      @if (versionUploadState() === UploadState.Idle) {
        <div class="input-group input-group-sm mb-2">
          <label class="input-group-text" for="newVersionLabel" i18n>Label</label>
          <input
@@ -32,7 +32,7 @@
          <i-bs name="file-earmark-plus"></i-bs><span class="ps-1" i18n>Add new version</span>
        </button>
      } @else {
-        @switch (versionUploadState) {
+        @switch (versionUploadState()) {
          @case (UploadState.Uploading) {
            <div class="small text-muted mt-1 d-flex align-items-center">
              <output class="spinner-border spinner-border-sm me-2" aria-hidden="true"></output>
@@ -50,8 +50,8 @@
              <span i18n>Version upload failed.</span>
              <button type="button" class="btn btn-link btn-sm p-0 ms-2" (click)="clearVersionUploadStatus()" i18n>Dismiss</button>
            </div>
-            @if (versionUploadError) {
-              <div class="small text-muted mt-1">{{ versionUploadError }}</div>
+            @if (versionUploadError()) {
+              <div class="small text-muted mt-1">{{ versionUploadError() }}</div>
            }
          }
        }
@@ -83,7 +83,7 @@
                    [(ngModel)]="versionLabelDraft"
                    i18n-placeholder
                    placeholder="Version label"
-                    [disabled]="savingVersionLabelId !== null"
+                    [disabled]="savingVersionLabelId() !== null"
                    (keydown.enter)="submitEditedVersionLabel(version, $event)"
                    (keydown.escape)="cancelEditingVersion($event)"
                    (click)="$event.stopPropagation()"
@@ -101,7 +101,7 @@
                  <button
                    type="button"
                    class="btn btn-outline-secondary"
-                    [disabled]="savingVersionLabelId !== null"
+                    [disabled]="savingVersionLabelId() !== null"
                    (click)="isEditingVersion(version.id) ? submitEditedVersionLabel(version, $event) : beginEditingVersion(version, $event)"
                  >
                    @if (isEditingVersion(version.id)) {
@@ -205,7 +205,7 @@ describe('DocumentVersionDropdownComponent', () => {
      { id: 3, is_root: true, checksum: 'aaaa' },
      { id: 10, is_root: false, checksum: 'bbbb', version_label: 'Updated' },
    ])
-    expect(component.savingVersionLabelId).toBeNull()
+    expect(component.savingVersionLabelId()).toBeNull()
  })

  it('saveVersionLabel should show error toast on failure', () => {
@@ -218,7 +218,7 @@ describe('DocumentVersionDropdownComponent', () => {
      'Error updating version label',
      error
    )
-    expect(component.savingVersionLabelId).toBeNull()
+    expect(component.savingVersionLabelId()).toBeNull()
  })

  it('onVersionFileSelected should upload and update versions after websocket success', () => {
@@ -252,11 +252,11 @@ describe('DocumentVersionDropdownComponent', () => {
    expect(versionsEmitSpy).toHaveBeenCalledWith(versions)
    expect(selectedEmitSpy).toHaveBeenCalledWith(20)
    expect(component.newVersionLabel).toEqual('')
-    expect(component.versionUploadState).toEqual(UploadState.Idle)
-    expect(component.versionUploadError).toBeNull()
+    expect(component.versionUploadState()).toEqual(UploadState.Idle)
+    expect(component.versionUploadError()).toBeNull()
  })

-  it('onVersionFileSelected should set failed state after websocket failure', () => {
+  it('onVersionFileSelected should render failed state after websocket failure', async () => {
    const file = new File(['test'], 'new-version.pdf', {
      type: 'application/pdf',
    })
@@ -266,9 +266,11 @@ describe('DocumentVersionDropdownComponent', () => {

    component.onVersionFileSelected({ target: input } as Event)
    failed$.next({ taskId: 'task-1', message: 'processing failed' })
+    await fixture.whenStable()

-    expect(component.versionUploadState).toEqual(UploadState.Failed)
-    expect(component.versionUploadError).toEqual('processing failed')
+    expect(component.versionUploadState()).toEqual(UploadState.Failed)
+    expect(component.versionUploadError()).toEqual('processing failed')
+    expect(fixture.nativeElement.textContent).toContain('processing failed')
    expect(documentService.getVersions).not.toHaveBeenCalled()
  })

@@ -282,8 +284,8 @@ describe('DocumentVersionDropdownComponent', () => {

    component.onVersionFileSelected({ target: input } as Event)

-    expect(component.versionUploadState).toEqual(UploadState.Failed)
-    expect(component.versionUploadError).toEqual('Missing task ID.')
+    expect(component.versionUploadState()).toEqual(UploadState.Failed)
+    expect(component.versionUploadError()).toEqual('Missing task ID.')
    expect(documentService.getVersions).not.toHaveBeenCalled()
  })

@@ -298,8 +300,8 @@ describe('DocumentVersionDropdownComponent', () => {

    component.onVersionFileSelected({ target: input } as Event)

-    expect(component.versionUploadState).toEqual(UploadState.Failed)
-    expect(component.versionUploadError).toEqual('upload failed')
+    expect(component.versionUploadState()).toEqual(UploadState.Failed)
+    expect(component.versionUploadError()).toEqual('upload failed')
    expect(toastService.showError).toHaveBeenCalledWith(
      'Error uploading new version',
      error
@@ -307,8 +309,8 @@ describe('DocumentVersionDropdownComponent', () => {
  })

  it('ngOnChanges should clear upload status on document switch', () => {
-    component.versionUploadState = UploadState.Failed
-    component.versionUploadError = 'something failed'
+    component.versionUploadState.set(UploadState.Failed)
+    component.versionUploadError.set('something failed')
    component.editingVersionId = 10
    component.versionLabelDraft = 'draft'

@@ -316,8 +318,8 @@ describe('DocumentVersionDropdownComponent', () => {
      documentId: new SimpleChange(3, 4, false),
    })

-    expect(component.versionUploadState).toEqual(UploadState.Idle)
-    expect(component.versionUploadError).toBeNull()
+    expect(component.versionUploadState()).toEqual(UploadState.Idle)
+    expect(component.versionUploadError()).toBeNull()
    expect(component.editingVersionId).toBeNull()
    expect(component.versionLabelDraft).toEqual('')
  })
@@ -7,6 +7,7 @@ import {
  OnChanges,
  OnDestroy,
  Output,
+  signal,
  SimpleChanges,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
@@ -59,9 +60,9 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
  @Output() versionsUpdated = new EventEmitter<DocumentVersionInfo[]>()

  newVersionLabel: string = ''
-  versionUploadState: UploadState = UploadState.Idle
-  versionUploadError: string | null = null
-  savingVersionLabelId: number | null = null
+  readonly versionUploadState = signal(UploadState.Idle)
+  readonly versionUploadError = signal<string | null>(null)
+  readonly savingVersionLabelId = signal<number | null>(null)
  editingVersionId: number | null = null
  versionLabelDraft: string = ''

@@ -101,7 +102,7 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
  beginEditingVersion(version: DocumentVersionInfo, event?: Event): void {
    event?.preventDefault()
    event?.stopPropagation()
-    if (!this.canEditLabels || this.savingVersionLabelId !== null) return
+    if (!this.canEditLabels || this.savingVersionLabelId() !== null) return
    this.editingVersionId = version.id
    this.versionLabelDraft = version.version_label ?? ''
  }
@@ -116,7 +117,7 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
  submitEditedVersionLabel(version: DocumentVersionInfo, event?: Event): void {
    event?.preventDefault()
    event?.stopPropagation()
-    if (this.savingVersionLabelId !== null) return
+    if (this.savingVersionLabelId() !== null) return
    const nextLabel = this.versionLabelDraft?.trim() || null
    const currentLabel = version.version_label?.trim() || null
    if (nextLabel === currentLabel) {
@@ -158,15 +159,15 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
  }

  saveVersionLabel(versionId: number, versionLabel: string | null): void {
-    if (this.savingVersionLabelId !== null) return
-    this.savingVersionLabelId = versionId
+    if (this.savingVersionLabelId() !== null) return
+    this.savingVersionLabelId.set(versionId)
    this.documentsService
      .updateVersionLabel(this.documentId, versionId, versionLabel)
      .pipe(
        first(),
        finalize(() => {
-          if (this.savingVersionLabelId === versionId) {
-            this.savingVersionLabelId = null
+          if (this.savingVersionLabelId() === versionId) {
+            this.savingVersionLabelId.set(null)
          }
        }),
        takeUntil(this.destroy$)
@@ -199,8 +200,8 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
    const file = input.files[0]
    input.value = ''
    const label = this.newVersionLabel?.trim()
-    this.versionUploadState = UploadState.Uploading
-    this.versionUploadError = null
+    this.versionUploadState.set(UploadState.Uploading)
+    this.versionUploadError.set(null)
    this.documentsService
      .uploadVersion(uploadDocumentId, file, label)
      .pipe(
@@ -210,7 +211,7 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
            $localize`Uploading new version. Processing will happen in the background.`
          )
          this.newVersionLabel = ''
-          this.versionUploadState = UploadState.Processing
+          this.versionUploadState.set(UploadState.Processing)
        }),
        map((taskId) =>
          typeof taskId === 'string'
@@ -219,8 +220,8 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
        ),
        switchMap((taskId) => {
          if (!taskId) {
-            this.versionUploadState = UploadState.Failed
-            this.versionUploadError = $localize`Missing task ID.`
+            this.versionUploadState.set(UploadState.Failed)
+            this.versionUploadError.set($localize`Missing task ID.`)
            return of(null)
          }
          return merge(
@@ -240,9 +241,10 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
        switchMap((result) => {
          if (result?.state !== 'success') {
            if (result?.state === 'failed') {
-              this.versionUploadState = UploadState.Failed
-              this.versionUploadError =
+              this.versionUploadState.set(UploadState.Failed)
+              this.versionUploadError.set(
                result.message || $localize`Upload failed.`
+              )
            }
            return of(null)
          }
@@ -264,8 +266,10 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
        },
        error: (error) => {
          if (uploadDocumentId !== this.documentId) return
-          this.versionUploadState = UploadState.Failed
-          this.versionUploadError = error?.message || $localize`Upload failed.`
+          this.versionUploadState.set(UploadState.Failed)
+          this.versionUploadError.set(
+            error?.message || $localize`Upload failed.`
+          )
          this.toastService.showError(
            $localize`Error uploading new version`,
            error
@@ -275,7 +279,7 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
  }

  clearVersionUploadStatus(): void {
-    this.versionUploadState = UploadState.Idle
-    this.versionUploadError = null
+    this.versionUploadState.set(UploadState.Idle)
+    this.versionUploadError.set(null)
  }
 }
@@ -10,7 +10,7 @@
        [createRef]="createTag.bind(this)"
        (opened)="openTagsDropdown()"
        [(selectionModel)]="tagSelectionModel"
-        [documentCounts]="tagDocumentCounts"
+        [documentCounts]="tagDocumentCounts()"
        (apply)="setTags($event)"
        shortcutKey="t">
      </pngx-filterable-dropdown>
@@ -24,7 +24,7 @@
        [createRef]="createCorrespondent.bind(this)"
        (opened)="openCorrespondentDropdown()"
        [(selectionModel)]="correspondentSelectionModel"
-        [documentCounts]="correspondentDocumentCounts"
+        [documentCounts]="correspondentDocumentCounts()"
        (apply)="setCorrespondents($event)"
        shortcutKey="y">
      </pngx-filterable-dropdown>
@@ -38,7 +38,7 @@
        [createRef]="createDocumentType.bind(this)"
        (opened)="openDocumentTypeDropdown()"
        [(selectionModel)]="documentTypeSelectionModel"
-        [documentCounts]="documentTypeDocumentCounts"
+        [documentCounts]="documentTypeDocumentCounts()"
        (apply)="setDocumentTypes($event)"
        shortcutKey="u">
      </pngx-filterable-dropdown>
@@ -52,7 +52,7 @@
        [createRef]="createStoragePath.bind(this)"
        (opened)="openStoragePathDropdown()"
        [(selectionModel)]="storagePathsSelectionModel"
-        [documentCounts]="storagePathDocumentCounts"
+        [documentCounts]="storagePathDocumentCounts()"
        (apply)="setStoragePaths($event)"
        shortcutKey="i">
      </pngx-filterable-dropdown>
@@ -66,7 +66,7 @@
        [createRef]="createCustomField.bind(this)"
        (opened)="openCustomFieldsDropdown()"
        [(selectionModel)]="customFieldsSelectionModel"
-        [documentCounts]="customFieldDocumentCounts"
+        [documentCounts]="customFieldDocumentCounts()"
        extraButtonTitle="Set values"
        i18n-extraButtonTitle
        (extraButton)="setCustomFieldValues($event)"
@@ -124,11 +124,11 @@
      </div>
    </div>
    <div class="btn-group btn-group-sm">
-      <button class="btn btn-sm btn-outline-primary" [disabled]="awaitingDownload" (click)="downloadSelected()">
-        @if (!awaitingDownload) {
+      <button class="btn btn-sm btn-outline-primary" [disabled]="awaitingDownload()" (click)="downloadSelected()">
+        @if (!awaitingDownload()) {
          <i-bs name="arrow-down"></i-bs>
        }
-        @if (awaitingDownload) {
+        @if (awaitingDownload()) {
          <div class="spinner-border spinner-border-sm" role="status">
            <span class="visually-hidden">Preparing download...</span>
          </div>
@@ -191,6 +191,14 @@ describe('BulkEditorComponent', () => {
  })

  afterEach(async () => {
+    // A filter_selection_data request now fires concurrently with every
+    // non-search reload(), independent of whether a given test flushes or
+    // even inspects the primary list response. Drain any left unclaimed.
+    httpTestingController.match(
+      (request) =>
+        request.url ===
+        `${environment.apiBaseUrl}documents/filter_selection_data/`
+    )
    httpTestingController.verify()
  })

@@ -303,7 +311,7 @@ describe('BulkEditorComponent', () => {
    component.openDocumentTypeDropdown()

    expect(getSelectionDataSpy).not.toHaveBeenCalled()
-    expect(component.documentTypeDocumentCounts).toEqual(
+    expect(component.documentTypeDocumentCounts()).toEqual(
      selectionData.selected_document_types
    )
  })
@@ -320,7 +328,7 @@ describe('BulkEditorComponent', () => {
    component.openCorrespondentDropdown()

    expect(getSelectionDataSpy).not.toHaveBeenCalled()
-    expect(component.correspondentDocumentCounts).toEqual(
+    expect(component.correspondentDocumentCounts()).toEqual(
      selectionData.selected_correspondents
    )
  })
@@ -337,7 +345,7 @@ describe('BulkEditorComponent', () => {
    component.openStoragePathDropdown()

    expect(getSelectionDataSpy).not.toHaveBeenCalled()
-    expect(component.storagePathDocumentCounts).toEqual(
+    expect(component.storagePathDocumentCounts()).toEqual(
      selectionData.selected_storage_paths
    )
  })
@@ -354,7 +362,7 @@ describe('BulkEditorComponent', () => {
    component.openCustomFieldsDropdown()

    expect(getSelectionDataSpy).not.toHaveBeenCalled()
-    expect(component.customFieldDocumentCounts).toEqual(
+    expect(component.customFieldDocumentCounts()).toEqual(
      selectionData.selected_custom_fields
    )
  })
@@ -386,7 +394,7 @@ describe('BulkEditorComponent', () => {
      parameters: { add_tags: [101], remove_tags: [] },
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -432,7 +440,7 @@ describe('BulkEditorComponent', () => {
      parameters: { add_tags: [101], remove_tags: [] },
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
  })

@@ -461,7 +469,7 @@ describe('BulkEditorComponent', () => {
      .expectOne(`${environment.apiBaseUrl}documents/bulk_edit/`)
      .flush(true)
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -552,7 +560,7 @@ describe('BulkEditorComponent', () => {
      parameters: { correspondent: 101 },
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -584,7 +592,7 @@ describe('BulkEditorComponent', () => {
      .expectOne(`${environment.apiBaseUrl}documents/bulk_edit/`)
      .flush(true)
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -650,7 +658,7 @@ describe('BulkEditorComponent', () => {
      parameters: { document_type: 101 },
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -682,7 +690,7 @@ describe('BulkEditorComponent', () => {
      .expectOne(`${environment.apiBaseUrl}documents/bulk_edit/`)
      .flush(true)
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -748,7 +756,7 @@ describe('BulkEditorComponent', () => {
      parameters: { storage_path: 101 },
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -780,7 +788,7 @@ describe('BulkEditorComponent', () => {
      .expectOne(`${environment.apiBaseUrl}documents/bulk_edit/`)
      .flush(true)
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -846,7 +854,7 @@ describe('BulkEditorComponent', () => {
      parameters: { add_custom_fields: [101], remove_custom_fields: [102] },
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -878,7 +886,7 @@ describe('BulkEditorComponent', () => {
      .expectOne(`${environment.apiBaseUrl}documents/bulk_edit/`)
      .flush(true)
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -987,7 +995,7 @@ describe('BulkEditorComponent', () => {
      documents: [3, 4],
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1080,7 +1088,7 @@ describe('BulkEditorComponent', () => {
      documents: [3, 4],
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1115,7 +1123,7 @@ describe('BulkEditorComponent', () => {
      source_mode: 'latest_version',
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1156,7 +1164,7 @@ describe('BulkEditorComponent', () => {
      metadata_document_id: 3,
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1175,7 +1183,7 @@ describe('BulkEditorComponent', () => {
      delete_originals: true,
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1196,7 +1204,7 @@ describe('BulkEditorComponent', () => {
      archive_fallback: true,
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1299,7 +1307,7 @@ describe('BulkEditorComponent', () => {
      },
    })
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1607,7 +1615,7 @@ describe('BulkEditorComponent', () => {
    expect(toastServiceShowInfoSpy).toHaveBeenCalled()
    expect(listReloadSpy).toHaveBeenCalled()
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1,4 +1,11 @@
-import { Component, inject, Input, OnDestroy, OnInit } from '@angular/core'
+import {
+  Component,
+  inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  signal,
+} from '@angular/core'
 import {
  FormControl,
  FormGroup,
@@ -101,12 +108,12 @@ export class BulkEditorComponent
  documentTypeSelectionModel = new FilterableDropdownSelectionModel()
  storagePathsSelectionModel = new FilterableDropdownSelectionModel()
  customFieldsSelectionModel = new FilterableDropdownSelectionModel(true)
-  tagDocumentCounts: SelectionDataItem[]
-  correspondentDocumentCounts: SelectionDataItem[]
-  documentTypeDocumentCounts: SelectionDataItem[]
-  storagePathDocumentCounts: SelectionDataItem[]
-  customFieldDocumentCounts: SelectionDataItem[]
-  awaitingDownload: boolean
+  readonly tagDocumentCounts = signal<SelectionDataItem[]>(undefined)
+  readonly correspondentDocumentCounts = signal<SelectionDataItem[]>(undefined)
+  readonly documentTypeDocumentCounts = signal<SelectionDataItem[]>(undefined)
+  readonly storagePathDocumentCounts = signal<SelectionDataItem[]>(undefined)
+  readonly customFieldDocumentCounts = signal<SelectionDataItem[]>(undefined)
+  readonly awaitingDownload = signal(false)

  unsubscribeNotifier: Subject<any> = new Subject()

@@ -365,8 +372,8 @@ export class BulkEditorComponent
  openTagsDropdown() {
    if (this.list.allSelected) {
      const selectionData = this.list.selectionData
-      this.tagDocumentCounts = selectionData?.selected_tags ?? []
-      this.applySelectionData(this.tagDocumentCounts, this.tagSelectionModel)
+      this.tagDocumentCounts.set(selectionData?.selected_tags ?? [])
+      this.applySelectionData(this.tagDocumentCounts(), this.tagSelectionModel)
      return
    }

@@ -374,7 +381,7 @@ export class BulkEditorComponent
      .getSelectionData(Array.from(this.list.selected))
      .pipe(first())
      .subscribe((s) => {
-        this.tagDocumentCounts = s.selected_tags
+        this.tagDocumentCounts.set(s.selected_tags)
        this.applySelectionData(s.selected_tags, this.tagSelectionModel)
      })
  }
@@ -382,10 +389,11 @@ export class BulkEditorComponent
  openDocumentTypeDropdown() {
    if (this.list.allSelected) {
      const selectionData = this.list.selectionData
-      this.documentTypeDocumentCounts =
+      this.documentTypeDocumentCounts.set(
        selectionData?.selected_document_types ?? []
+      )
      this.applySelectionData(
-        this.documentTypeDocumentCounts,
+        this.documentTypeDocumentCounts(),
        this.documentTypeSelectionModel
      )
      return
@@ -395,7 +403,7 @@ export class BulkEditorComponent
      .getSelectionData(Array.from(this.list.selected))
      .pipe(first())
      .subscribe((s) => {
-        this.documentTypeDocumentCounts = s.selected_document_types
+        this.documentTypeDocumentCounts.set(s.selected_document_types)
        this.applySelectionData(
          s.selected_document_types,
          this.documentTypeSelectionModel
@@ -406,10 +414,11 @@ export class BulkEditorComponent
  openCorrespondentDropdown() {
    if (this.list.allSelected) {
      const selectionData = this.list.selectionData
-      this.correspondentDocumentCounts =
+      this.correspondentDocumentCounts.set(
        selectionData?.selected_correspondents ?? []
+      )
      this.applySelectionData(
-        this.correspondentDocumentCounts,
+        this.correspondentDocumentCounts(),
        this.correspondentSelectionModel
      )
      return
@@ -419,7 +428,7 @@ export class BulkEditorComponent
      .getSelectionData(Array.from(this.list.selected))
      .pipe(first())
      .subscribe((s) => {
-        this.correspondentDocumentCounts = s.selected_correspondents
+        this.correspondentDocumentCounts.set(s.selected_correspondents)
        this.applySelectionData(
          s.selected_correspondents,
          this.correspondentSelectionModel
@@ -430,10 +439,11 @@ export class BulkEditorComponent
  openStoragePathDropdown() {
    if (this.list.allSelected) {
      const selectionData = this.list.selectionData
-      this.storagePathDocumentCounts =
+      this.storagePathDocumentCounts.set(
        selectionData?.selected_storage_paths ?? []
+      )
      this.applySelectionData(
-        this.storagePathDocumentCounts,
+        this.storagePathDocumentCounts(),
        this.storagePathsSelectionModel
      )
      return
@@ -443,7 +453,7 @@ export class BulkEditorComponent
      .getSelectionData(Array.from(this.list.selected))
      .pipe(first())
      .subscribe((s) => {
-        this.storagePathDocumentCounts = s.selected_storage_paths
+        this.storagePathDocumentCounts.set(s.selected_storage_paths)
        this.applySelectionData(
          s.selected_storage_paths,
          this.storagePathsSelectionModel
@@ -454,10 +464,11 @@ export class BulkEditorComponent
  openCustomFieldsDropdown() {
    if (this.list.allSelected) {
      const selectionData = this.list.selectionData
-      this.customFieldDocumentCounts =
+      this.customFieldDocumentCounts.set(
        selectionData?.selected_custom_fields ?? []
+      )
      this.applySelectionData(
-        this.customFieldDocumentCounts,
+        this.customFieldDocumentCounts(),
        this.customFieldsSelectionModel
      )
      return
@@ -467,7 +478,7 @@ export class BulkEditorComponent
      .getSelectionData(Array.from(this.list.selected))
      .pipe(first())
      .subscribe((s) => {
-        this.customFieldDocumentCounts = s.selected_custom_fields
+        this.customFieldDocumentCounts.set(s.selected_custom_fields)
        this.applySelectionData(
          s.selected_custom_fields,
          this.customFieldsSelectionModel
@@ -876,7 +887,7 @@ export class BulkEditorComponent
  }

  downloadSelected() {
-    this.awaitingDownload = true
+    this.awaitingDownload.set(true)
    let downloadFileType: string =
      this.downloadForm.get('downloadFileTypeArchive').value &&
      this.downloadForm.get('downloadFileTypeOriginals').value
@@ -893,7 +904,7 @@ export class BulkEditorComponent
      .pipe(first())
      .subscribe((result: any) => {
        saveAs(result, 'documents.zip')
-        this.awaitingDownload = false
+        this.awaitingDownload.set(false)
      })
  }

@@ -2,7 +2,7 @@
  <div class="row g-0">
    <div class="col-md-2 doc-img-container rounded-start" (click)="this.toggleSelected.emit($event)" (dblclick)="dblClickDocument.emit()">
       @if (document()) {
-        <img [src]="getThumbUrl()" class="card-img doc-img border-end rounded-start" [class.inverted]="getIsThumbInverted()">
+        <img [ngSrc]="getThumbUrl()" fill class="card-img doc-img border-end rounded-start" [class.inverted]="getIsThumbInverted()">

        <div class="border-end border-bottom bg-light document-card-check">
          <div class="form-check">
@@ -88,6 +88,12 @@ describe('DocumentCardLargeComponent', () => {
    expect(fixture.nativeElement.textContent).toContain('8 pages')
  })

+  it('should lazy load the thumbnail', () => {
+    const thumbnail: HTMLImageElement =
+      fixture.nativeElement.querySelector('img.doc-img')
+    expect(thumbnail.getAttribute('loading')).toEqual('lazy')
+  })
+
  it('should trim content', () => {
    expect(component.contentTrimmed).toHaveLength(503) // includes ...
  })
@@ -1,4 +1,4 @@
-import { AsyncPipe } from '@angular/common'
+import { AsyncPipe, NgOptimizedImage } from '@angular/common'
 import {
  AfterViewInit,
  Component,
@@ -46,6 +46,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
    TagComponent,
    CustomFieldDisplayComponent,
    AsyncPipe,
+    NgOptimizedImage,
    UsernamePipe,
    CorrespondentNamePipe,
    DocumentTypeNamePipe,
@@ -2,7 +2,7 @@
  <div class="card h-100 shadow-sm document-card" [class.placeholder-glow]="!document()" [class.card-selected]="selected()" (mouseleave)="mouseLeaveCard()">
    <div class="border-bottom doc-img-container rounded-top" (click)="this.toggleSelected.emit($event)" (dblclick)="dblClickDocument.emit(this)">
       @if (document()) {
-        <img class="card-img doc-img" [class.inverted]="getIsThumbInverted()" [src]="getThumbUrl()">
+        <img class="card-img doc-img" [class.inverted]="getIsThumbInverted()" [ngSrc]="getThumbUrl()" fill>

        <div class="border-end border-bottom bg-light py-1 px-2 document-card-check">
          <div class="form-check">
@@ -22,10 +22,14 @@
  }
 }

+.doc-img-container {
+  position: relative;
+  height: 180px;
+}
+
 .doc-img {
  object-fit: cover;
  object-position: top left;
-  height: 180px;
 }

 .document-card-check {
@@ -61,6 +61,12 @@ describe('DocumentCardSmallComponent', () => {
    expect(fixture.nativeElement.textContent).toContain('12 pages')
  })

+  it('should lazy load the thumbnail', () => {
+    const thumbnail: HTMLImageElement =
+      fixture.nativeElement.querySelector('img.doc-img')
+    expect(thumbnail.getAttribute('loading')).toEqual('lazy')
+  })
+
  it('should display a document, limit tags to 5', () => {
    expect(fixture.nativeElement.textContent).toContain('Document 10')
    expect(
@@ -1,4 +1,4 @@
-import { AsyncPipe } from '@angular/common'
+import { AsyncPipe, NgOptimizedImage } from '@angular/common'
 import {
  AfterViewInit,
  Component,
@@ -46,6 +46,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
    TagComponent,
    CustomFieldDisplayComponent,
    AsyncPipe,
+    NgOptimizedImage,
    UsernamePipe,
    CorrespondentNamePipe,
    DocumentTypeNamePipe,
@@ -115,7 +115,7 @@
 </pngx-page-header>

 <div class="row sticky-top py-3 mt-n2 mt-md-n3 bg-body">
-  <pngx-filter-editor [hidden]="isBulkEditing" [disabled]="isBulkEditing" [filterRules]="list.filterRules" (filterRulesChange)="onFilterRulesChange($event)" (resetFilterRules)="onFilterRulesReset($event)" [unmodifiedFilterRules]="unmodifiedFilterRules" [selectionData]="list.selectionData" #filterEditor></pngx-filter-editor>
+  <pngx-filter-editor [hidden]="isBulkEditing" [disabled]="isBulkEditing" [filterRules]="list.filterRules" (filterRulesChange)="onFilterRulesChange($event)" (resetFilterRules)="onFilterRulesReset($event)" [unmodifiedFilterRules]="unmodifiedFilterRules()" [selectionData]="list.selectionData" #filterEditor></pngx-filter-editor>
  <pngx-bulk-editor [hidden]="!isBulkEditing" [disabled]="!isBulkEditing"></pngx-bulk-editor>
 </div>

@@ -5,6 +5,7 @@ import {
  OnDestroy,
  OnInit,
  QueryList,
+  signal,
  ViewChild,
  ViewChildren,
 } from '@angular/core'
@@ -149,7 +150,7 @@ export class DocumentListComponent
    )
  }

-  unmodifiedFilterRules: FilterRule[] = []
+  readonly unmodifiedFilterRules = signal<FilterRule[]>([])
  private unmodifiedSavedView: SavedView
  private activeSavedView: SavedView | null = null

@@ -299,7 +300,7 @@ export class DocumentListComponent
          this.savedViewService.setDocumentCount(view, this.list.collectionSize)
        })
        this.updateDisplayCustomFields()
-        this.unmodifiedFilterRules = view.filter_rules
+        this.unmodifiedFilterRules.set(view.filter_rules)
      })

    this.route.queryParamMap
@@ -316,7 +317,7 @@ export class DocumentListComponent
          this.activeSavedView = null
          this.list.activateSavedView(null)
          this.list.loadFromQueryParams(queryParams)
-          this.unmodifiedFilterRules = []
+          this.unmodifiedFilterRules.set([])
        }
      })

@@ -415,7 +416,7 @@ export class DocumentListComponent
            this.toastService.showInfo(
              $localize`View "${this.list.activeSavedViewTitle}" saved successfully.`
            )
-            this.unmodifiedFilterRules = this.list.filterRules
+            this.unmodifiedFilterRules.set(this.list.filterRules)
          },
          error: (err) => {
            this.toastService.showError(
@@ -80,7 +80,7 @@
          shortcutKey="i"></pngx-filterable-dropdown>
        }

-        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.CustomField) && customFields.length > 0) {
+        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.CustomField) && customFields().length > 0) {
          <pngx-custom-fields-query-dropdown class="flex-fill fade" [class.show]="show()" title="Custom fields" icon="ui-radios" i18n-title
          [(selectionModel)]="customFieldQueriesModel"
          (selectionModelChange)="updateRules()"
@@ -1,5 +1,6 @@
 import {
  AfterViewInit,
+  ChangeDetectorRef,
  Component,
  ElementRef,
  EventEmitter,
@@ -9,6 +10,7 @@ import {
  Output,
  ViewChild,
  inject,
+  signal,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import {
@@ -349,7 +351,7 @@ export class FilterEditorComponent
  @ViewChild('textFilterInput')
  textFilterInput: ElementRef

-  customFields: CustomField[] = []
+  readonly customFields = signal<CustomField[]>([])

  tagDocumentCounts: SelectionDataItem[]
  correspondentDocumentCounts: SelectionDataItem[]
@@ -514,6 +516,7 @@ export class FilterEditorComponent
          this.documentService.get(this._moreLikeId).subscribe((result) => {
            this._moreLikeDoc = result
            this._textFilter = result.title
+            this.changeDetector.markForCheck()
          })
          break
        case FILTER_CREATED_AFTER:
@@ -1162,6 +1165,7 @@ export class FilterEditorComponent

  private loadingCountTotal: number = 0
  private loadingCount: number = 0
+  private readonly changeDetector = inject(ChangeDetectorRef)

  private maybeCompleteLoading() {
    this.loadingCount++
@@ -1229,7 +1233,7 @@ export class FilterEditorComponent
    ) {
      this.loadingCountTotal++
      this.customFieldService.listAll().subscribe((result) => {
-        this.customFields = result.results
+        this.customFields.set(result.results)
        this.maybeCompleteLoading()
      })
    }
@@ -84,6 +84,28 @@ const view: SavedView = {
  filter_rules: filterRules,
 }

+const emptySelectionData = {
+  selected_correspondents: [],
+  selected_tags: [],
+  selected_document_types: [],
+  selected_storage_paths: [],
+  selected_custom_fields: [],
+}
+
+// A successful (non-search) list response now triggers a separate,
+// non-blocking request for filter dropdown counts. Tests that flush a
+// successful list response need to also flush this follow-up request.
+function flushSelectionDataRequest(
+  httpTestingController: HttpTestingController,
+  querySuffix: string = ''
+) {
+  const req = httpTestingController.expectOne(
+    `${environment.apiBaseUrl}documents/filter_selection_data/${querySuffix}`
+  )
+  expect(req.request.method).toEqual('GET')
+  req.flush(emptySelectionData)
+}
+
 describe('DocumentListViewService', () => {
  let httpTestingController: HttpTestingController
  let documentListViewService: DocumentListViewService
@@ -105,6 +127,7 @@ describe('DocumentListViewService', () => {
    })

    sessionStorage.clear()
+    localStorage.clear()
    httpTestingController = TestBed.inject(HttpTestingController)
    documentListViewService = TestBed.inject(DocumentListViewService)
    settingsService = TestBed.inject(SettingsService)
@@ -114,8 +137,19 @@ describe('DocumentListViewService', () => {

  afterEach(() => {
    documentListViewService.cancelPending()
+    // A filter_selection_data request now fires concurrently with every
+    // non-search reload(), independent of whether the test cares about or
+    // flushes the primary list response. Drain any that a test didn't
+    // explicitly claim via flushSelectionDataRequest, so unrelated tests
+    // don't have to know about this follow-up request to pass verify().
+    httpTestingController.match(
+      (request) =>
+        request.url ===
+        `${environment.apiBaseUrl}documents/filter_selection_data/`
+    )
    httpTestingController.verify()
    sessionStorage.clear()
+    localStorage.clear()
  })

  afterAll(() => {
@@ -128,10 +162,11 @@ describe('DocumentListViewService', () => {
    expect(documentListViewService.currentPage).toEqual(1)
    documentListViewService.reload()
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    flushSelectionDataRequest(httpTestingController)
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.isReloading).toBeFalsy()
    expect(documentListViewService.activeSavedViewId).toBeNull()
@@ -143,12 +178,12 @@ describe('DocumentListViewService', () => {
  it('should handle error on page request out of range', () => {
    documentListViewService.currentPage = 50
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=50&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=50&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    req.flush([], { status: 404, statusText: 'Unexpected error' })
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.currentPage).toEqual(1)
@@ -165,21 +200,20 @@ describe('DocumentListViewService', () => {
    ]
    documentListViewService.setFilterRules(filterRulesAny)
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__in=${tags__id__in}`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false&tags__id__in=${tags__id__in}`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(
      { archive_serial_number: 'hello' },
      { status: 404, statusText: 'Unexpected error' }
    )
-    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
-    )
-    expect(req.request.method).toEqual('GET')
+    // the error is a plain field error (not a page-out-of-range or deleted
+    // custom-field-sort case), so no automatic retry request is sent here
+    expect(documentListViewService.error).toBeTruthy()
    // reset the list
    documentListViewService.setFilterRules([])
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
  })

@@ -187,7 +221,7 @@ describe('DocumentListViewService', () => {
    documentListViewService.currentPage = 1
    documentListViewService.sortField = 'custom_field_999'
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-custom_field_999&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-custom_field_999&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(
@@ -196,7 +230,7 @@ describe('DocumentListViewService', () => {
    )
    // resets itself
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
  })

@@ -211,7 +245,7 @@ describe('DocumentListViewService', () => {
    ]
    documentListViewService.setFilterRules(filterRulesAny)
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__in=${tags__id__in}`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false&tags__id__in=${tags__id__in}`
    )
    expect(req.request.method).toEqual('GET')
    req.flush('Generic error', { status: 404, statusText: 'Unexpected error' })
@@ -219,7 +253,7 @@ describe('DocumentListViewService', () => {
    // reset the list
    documentListViewService.setFilterRules([])
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
  })

@@ -228,7 +262,7 @@ describe('DocumentListViewService', () => {
    expect(documentListViewService.sortReverse).toBeTruthy()
    documentListViewService.setSort('added', false)
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=added&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=added&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.sortField).toEqual('added')
@@ -236,12 +270,12 @@ describe('DocumentListViewService', () => {

    documentListViewService.sortField = 'created'
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=created&truncate_content=true&include_selection_data=false`
    )
    expect(documentListViewService.sortField).toEqual('created')
    documentListViewService.sortReverse = true
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.sortReverse).toBeTruthy()
@@ -284,7 +318,7 @@ describe('DocumentListViewService', () => {
    const req = httpTestingController.expectOne(
      `${environment.apiBaseUrl}documents/?page=${page}&page_size=${
        documentListViewService.pageSize
-      }&ordering=${reverse ? '-' : ''}${sort}&truncate_content=true&include_selection_data=true`
+      }&ordering=${reverse ? '-' : ''}${sort}&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.currentPage).toEqual(page)
@@ -301,7 +335,7 @@ describe('DocumentListViewService', () => {
    }
    documentListViewService.loadFromQueryParams(convertToParamMap(params))
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=${documentListViewService.currentPage}&page_size=${documentListViewService.pageSize}&ordering=-added&truncate_content=true&include_selection_data=true&tags__id__all=${tags__id__all}`
+      `${environment.apiBaseUrl}documents/?page=${documentListViewService.currentPage}&page_size=${documentListViewService.pageSize}&ordering=-added&truncate_content=true&include_selection_data=false&tags__id__all=${tags__id__all}`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.filterRules).toEqual([
@@ -311,12 +345,16 @@ describe('DocumentListViewService', () => {
      },
    ])
    req.flush(full_results)
+    flushSelectionDataRequest(
+      httpTestingController,
+      `?tags__id__all=${tags__id__all}`
+    )
  })

  it('should use filter rules to update query params', () => {
    documentListViewService.setFilterRules(filterRules)
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=${documentListViewService.currentPage}&page_size=${documentListViewService.pageSize}&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=${tags__id__all}`
+      `${environment.apiBaseUrl}documents/?page=${documentListViewService.currentPage}&page_size=${documentListViewService.pageSize}&ordering=-created&truncate_content=true&include_selection_data=false&tags__id__all=${tags__id__all}`
    )
    expect(req.request.method).toEqual('GET')
  })
@@ -325,26 +363,31 @@ describe('DocumentListViewService', () => {
    documentListViewService.currentPage = 2
    let req = httpTestingController.expectOne((request) =>
      request.urlWithParams.startsWith(
-        `${environment.apiBaseUrl}documents/?page=2&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+        `${environment.apiBaseUrl}documents/?page=2&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
      )
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    flushSelectionDataRequest(httpTestingController)

    documentListViewService.setFilterRules(filterRules, true)

    const filteredReqs = httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=${tags__id__all}`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false&tags__id__all=${tags__id__all}`
    )
    expect(filteredReqs).toHaveLength(1)
    filteredReqs[0].flush(full_results)
+    flushSelectionDataRequest(
+      httpTestingController,
+      `?tags__id__all=${tags__id__all}`
+    )
    expect(documentListViewService.currentPage).toEqual(1)
  })

  it('should support quick filter', () => {
    documentListViewService.quickFilter(filterRules)
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=${documentListViewService.currentPage}&page_size=${documentListViewService.pageSize}&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=${tags__id__all}`
+      `${environment.apiBaseUrl}documents/?page=${documentListViewService.currentPage}&page_size=${documentListViewService.pageSize}&ordering=-created&truncate_content=true&include_selection_data=false&tags__id__all=${tags__id__all}`
    )
    expect(req.request.method).toEqual('GET')
  })
@@ -367,21 +410,21 @@ describe('DocumentListViewService', () => {
      convertToParamMap(params)
    )
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=${page}&page_size=${documentListViewService.pageSize}&ordering=-added&truncate_content=true&include_selection_data=true&tags__id__all=${tags__id__all}`
+      `${environment.apiBaseUrl}documents/?page=${page}&page_size=${documentListViewService.pageSize}&ordering=-added&truncate_content=true&include_selection_data=false&tags__id__all=${tags__id__all}`
    )
    expect(req.request.method).toEqual('GET')
    // reset the list
    documentListViewService.currentPage = 1
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-added&truncate_content=true&include_selection_data=true&tags__id__all=9`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-added&truncate_content=true&include_selection_data=false&tags__id__all=9`
    )
    documentListViewService.setFilterRules([])
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-added&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-added&truncate_content=true&include_selection_data=false`
    )
    documentListViewService.sortField = 'created'
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    documentListViewService.activateSavedView(null)
  })
@@ -389,18 +432,22 @@ describe('DocumentListViewService', () => {
  it('should support navigating next / previous', () => {
    documentListViewService.setFilterRules([])
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(documentListViewService.currentPage).toEqual(1)
    documentListViewService.pageSize = 3
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    req.flush({
      count: 3,
      results: documents.slice(0, 3),
    })
+    // two reload()s ran above (setFilterRules, then pageSize), each firing
+    // its own concurrent filter_selection_data request with an identical
+    // (unfiltered) URL; this test doesn't assert on selectionData, so let
+    // afterEach's drain step clean both up rather than disambiguating here.
    expect(documentListViewService.hasNext(documents[0].id)).toBeTruthy()
    expect(documentListViewService.hasPrevious(documents[0].id)).toBeFalsy()
    documentListViewService.getNext(documents[0].id).subscribe((docId) => {
@@ -447,7 +494,7 @@ describe('DocumentListViewService', () => {
    expect(documentListViewService.currentPage).toEqual(1)
    documentListViewService.pageSize = 3
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    jest
      .spyOn(documentListViewService, 'getLastPage')
@@ -462,7 +509,7 @@ describe('DocumentListViewService', () => {
    expect(reloadSpy).toHaveBeenCalled()
    expect(documentListViewService.currentPage).toEqual(2)
    const reqs = httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=2&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=2&page_size=3&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(reqs.length).toBeGreaterThan(0)
  })
@@ -497,11 +544,11 @@ describe('DocumentListViewService', () => {
      .mockReturnValue(documents)
    documentListViewService.currentPage = 2
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=2&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=2&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    documentListViewService.pageSize = 3
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=2&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=2&page_size=3&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    const reloadSpy = jest.spyOn(documentListViewService, 'reload')
    documentListViewService.getPrevious(1).subscribe({
@@ -511,7 +558,7 @@ describe('DocumentListViewService', () => {
    expect(reloadSpy).toHaveBeenCalled()
    expect(documentListViewService.currentPage).toEqual(1)
    const reqs = httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(reqs.length).toBeGreaterThan(0)
  })
@@ -524,10 +571,11 @@ describe('DocumentListViewService', () => {
  it('should support select a document', () => {
    documentListViewService.reload()
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    flushSelectionDataRequest(httpTestingController)
    documentListViewService.toggleSelected(documents[0])
    expect(documentListViewService.isSelected(documents[0])).toBeTruthy()
    documentListViewService.toggleSelected(documents[0])
@@ -537,10 +585,11 @@ describe('DocumentListViewService', () => {
  it('should support select all', () => {
    documentListViewService.reload()
    const reloadReq = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(reloadReq.request.method).toEqual('GET')
    reloadReq.flush(full_results)
+    flushSelectionDataRequest(httpTestingController)

    documentListViewService.selectAll()
    expect(documentListViewService.allSelected).toBeTruthy()
@@ -553,13 +602,14 @@ describe('DocumentListViewService', () => {
  it('should support select page', () => {
    documentListViewService.pageSize = 3
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    req.flush({
      count: 3,
      results: documents.slice(0, 3),
    })
+    flushSelectionDataRequest(httpTestingController)
    documentListViewService.selectPage()
    expect(documentListViewService.selected.size).toEqual(3)
    expect(documentListViewService.isSelected(documents[5])).toBeFalsy()
@@ -568,10 +618,11 @@ describe('DocumentListViewService', () => {
  it('should support select range', () => {
    documentListViewService.reload()
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    flushSelectionDataRequest(httpTestingController)
    documentListViewService.toggleSelected(documents[0])
    expect(documentListViewService.isSelected(documents[0])).toBeTruthy()
    documentListViewService.selectRangeTo(documents[2])
@@ -583,9 +634,10 @@ describe('DocumentListViewService', () => {
  it('should clear all-selected mode when toggling a single document', () => {
    documentListViewService.reload()
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    req.flush(full_results)
+    flushSelectionDataRequest(httpTestingController)

    documentListViewService.selectAll()
    expect(documentListViewService.allSelected).toBeTruthy()
@@ -599,9 +651,10 @@ describe('DocumentListViewService', () => {
  it('should clear all-selected mode when selecting a range', () => {
    documentListViewService.reload()
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    req.flush(full_results)
+    flushSelectionDataRequest(httpTestingController)

    documentListViewService.selectAll()
    documentListViewService.toggleSelected(documents[1])
@@ -619,22 +672,24 @@ describe('DocumentListViewService', () => {
  it('should support selection range reduction', () => {
    documentListViewService.reload()
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    flushSelectionDataRequest(httpTestingController)

    documentListViewService.selectAll()
    expect(documentListViewService.selected.size).toEqual(6)

    documentListViewService.setFilterRules(filterRules)
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=9`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false&tags__id__all=9`
    )
    req.flush({
      count: 3,
      results: documents.slice(0, 3),
    })
+    flushSelectionDataRequest(httpTestingController, '?tags__id__all=9')
    expect(documentListViewService.allSelected).toBeTruthy()
    expect(documentListViewService.selected.size).toEqual(3)
  })
@@ -643,7 +698,7 @@ describe('DocumentListViewService', () => {
    const cancelSpy = jest.spyOn(documentListViewService, 'cancelPending')
    documentListViewService.reload()
    httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=9`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(cancelSpy).toHaveBeenCalled()
  })
@@ -662,7 +717,7 @@ describe('DocumentListViewService', () => {
    documentListViewService.setFilterRules([])
    expect(documentListViewService.sortField).toEqual('created')
    httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
  })

@@ -689,11 +744,11 @@ describe('DocumentListViewService', () => {
    expect(localStorageSpy).toHaveBeenCalled()
    // reload triggered
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    documentListViewService.displayFields = null
    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    expect(documentListViewService.displayFields).toEqual(
      DEFAULT_DISPLAY_FIELDS.filter((f) => f.id !== DisplayField.ADDED).map(
@@ -738,7 +793,7 @@ describe('DocumentListViewService', () => {
  it('should generate quick filter URL preserving default state', () => {
    documentListViewService.reload()
    httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
+      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=false`
    )
    const urlTree = documentListViewService.getQuickFilterUrl(filterRules)
    expect(urlTree).toBeDefined()
@@ -314,12 +314,39 @@ export class DocumentListViewService {
    }
  }

+  private loadFilterSelectionData(filterRules: FilterRule[]) {
+    this.documentService
+      .getFilterSelectionData(filterRules)
+      .pipe(takeUntil(this.unsubscribeNotifier))
+      .subscribe({
+        next: (selectionData) => {
+          this.selectionData = selectionData
+          this.markChanged()
+        },
+        error: () => {
+          this.selectionData = null
+          this.markChanged()
+        },
+      })
+  }
+
  reload(onFinish?, updateQueryParams: boolean = true) {
    this.cancelPending()
    this.isReloading = true
    this.error = null
    this.markChanged()
    let activeListViewState = this.activeListViewState
+    // Full-text search results are already narrowed by the search backend, so
+    // computing selection data inline there is cheap. A plain (unfiltered or
+    // ORM-filtered) browse can span the entire document set, so its selection
+    // data is fetched separately -- concurrently with the list itself, rather
+    // than blocking or waiting on it.
+    const isFullTextSearch = isFullTextFilterRule(
+      activeListViewState.filterRules
+    )
+    if (!isFullTextSearch) {
+      this.loadFilterSelectionData(activeListViewState.filterRules)
+    }
    this.documentService
      .listFiltered(
        activeListViewState.currentPage,
@@ -327,17 +354,22 @@ export class DocumentListViewService {
        activeListViewState.sortField,
        activeListViewState.sortReverse,
        activeListViewState.filterRules,
-        { truncate_content: true, include_selection_data: true }
+        {
+          truncate_content: true,
+          include_selection_data: isFullTextSearch,
+        }
      )
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe({
        next: (result) => {
-          const resultWithSelectionData = result as DocumentResults
          this.initialized = true
          this.isReloading = false
          activeListViewState.collectionSize = result.count
          activeListViewState.documents = result.results
-          this.selectionData = resultWithSelectionData.selection_data ?? null
+          if (isFullTextSearch) {
+            this.selectionData =
+              (result as DocumentResults).selection_data ?? null
+          }
          this.syncSelectedToCurrentPage()
          this.markChanged()

@@ -376,6 +408,9 @@ export class DocumentListViewService {
            // e.g. field was deleted
            this.sortField = 'created'
          } else {
+            // cancel the concurrently-fired selection-data request too, so it
+            // can't resolve afterward and clobber this reset with stale data
+            this.cancelPending()
            this.selectionData = null
            let errorMessage
            if (
@@ -41,6 +41,24 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
    }
  }

+  /**
+   * Merges a plain params object into an HttpParams instance, skipping
+   * null/undefined values so they aren't serialized as literal "null" /
+   * "undefined" query string entries.
+   */
+  protected withParams(
+    params,
+    base: HttpParams = new HttpParams()
+  ): HttpParams {
+    let httpParams = base
+    for (let key in params) {
+      if (params[key] != null) {
+        httpParams = httpParams.set(key, params[key])
+      }
+    }
+    return httpParams
+  }
+
  list(
    page?: number,
    pageSize?: number,
@@ -60,11 +78,7 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
    if (ordering) {
      httpParams = httpParams.set('ordering', ordering)
    }
-    for (let extraParamKey in extraParams) {
-      if (extraParams[extraParamKey] != null) {
-        httpParams = httpParams.set(extraParamKey, extraParams[extraParamKey])
-      }
-    }
+    httpParams = this.withParams(extraParams, httpParams)
    return this.http
      .get<Results<T>>(this.getResourceUrl(), {
        params: httpParams,
@@ -113,11 +127,7 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
    httpParams = httpParams.set('id__in', ids.join(','))
    httpParams = httpParams.set('ordering', '-id')
    httpParams = httpParams.set('page_size', 1000)
-    for (let extraParamKey in extraParams) {
-      if (extraParams[extraParamKey] != null) {
-        httpParams = httpParams.set(extraParamKey, extraParams[extraParamKey])
-      }
-    }
+    httpParams = this.withParams(extraParams, httpParams)
    return this.http
      .get<Results<T>>(this.getResourceUrl(), {
        params: httpParams,
@@ -398,6 +398,13 @@ export class DocumentService extends AbstractPaperlessService<Document> {
    )
  }

+  getFilterSelectionData(filterRules: FilterRule[]): Observable<SelectionData> {
+    return this.http.get<SelectionData>(
+      this.getResourceUrl(null, 'filter_selection_data'),
+      { params: this.withParams(queryParamsFromFilterRules(filterRules)) }
+    )
+  }
+
  getSuggestions(id: number): Observable<DocumentSuggestions> {
    return this.http.get<DocumentSuggestions>(
      this.getResourceUrl(id, 'suggestions')
@@ -1,9 +1,9 @@
 from datetime import UTC
 from datetime import datetime
-from typing import Any

 from django.conf import settings
 from django.core.cache import cache
+from rest_framework.request import Request

 from documents.caching import CACHE_5_MINUTES
 from documents.caching import CACHE_50_MINUTES
@@ -117,7 +117,7 @@ def preview_last_modified(request, pk: int) -> datetime | None:
    return doc.modified


-def thumbnail_etag(request: Any, pk: int) -> str | None:
+def thumbnail_etag(request: Request, pk: int) -> str | None:
    """
    Thumbnails are version-dependent, so use the effective document checksum as
    the ETag to invalidate cache when the latest version changes.
@@ -128,7 +128,7 @@ def thumbnail_etag(request: Any, pk: int) -> str | None:
    return doc.checksum


-def thumbnail_last_modified(request: Any, pk: int) -> datetime | None:
+def thumbnail_last_modified(request: Request, pk: int) -> datetime | None:
    """
    Returns the filesystem last modified either from cache or from filesystem.
    Cache should be (slightly?) faster than filesystem
@@ -621,6 +621,11 @@ class ConsumerPlugin(
                            else:
                                original_document.save()

+                            # Adding a version changes the effective document, so update root modified
+                            Document.objects.filter(pk=root_doc.pk).update(
+                                modified=timezone.now(),
+                            )
+
                            # Create a log entry for the version addition, if enabled
                            if settings.AUDIT_LOG_ENABLED:
                                from auditlog.models import (  # type: ignore[import-untyped]
@@ -0,0 +1,73 @@
+# Generated by Django 5.2.16 on 2026-07-19 20:33
+
+import django.core.validators
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("documents", "0021_widen_workflow_integer_fields"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="document",
+            name="checksum",
+            field=models.CharField(
+                db_index=True,
+                editable=False,
+                help_text="The checksum of the original document.",
+                max_length=64,
+                verbose_name="checksum",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="document",
+            name="page_count",
+            field=models.PositiveIntegerField(
+                db_index=True,
+                help_text="The number of pages of the document.",
+                null=True,
+                validators=[django.core.validators.MinValueValidator(1)],
+                verbose_name="page count",
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="customfieldinstance",
+            index=models.Index(
+                fields=["field", "value_date"],
+                name="documents_c_field_i_30b51d_idx",
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="customfieldinstance",
+            index=models.Index(
+                fields=["field", "value_int"],
+                name="documents_c_field_i_d25ab0_idx",
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="customfieldinstance",
+            index=models.Index(
+                fields=["field", "value_float"],
+                name="documents_c_field_i_c35174_idx",
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="customfieldinstance",
+            index=models.Index(
+                fields=["field", "value_monetary_amount"],
+                name="documents_c_field_i_53ce4e_idx",
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="document",
+            index=models.Index(
+                fields=["owner", "created"],
+                name="documents_d_owner_i_ec6ab3_idx",
+            ),
+        ),
+    ]
@@ -217,6 +217,7 @@ class Document(SoftDeleteModel, ModelWithOwner):  # type: ignore[django-manager-
        _("checksum"),
        max_length=64,
        editable=False,
+        db_index=True,
        help_text=_("The checksum of the original document."),
    )

@@ -234,7 +235,7 @@ class Document(SoftDeleteModel, ModelWithOwner):  # type: ignore[django-manager-
        blank=False,
        null=True,
        unique=False,
-        db_index=False,
+        db_index=True,
        validators=[MinValueValidator(1)],
        help_text=_(
            "The number of pages of the document.",
@@ -338,6 +339,9 @@ class Document(SoftDeleteModel, ModelWithOwner):  # type: ignore[django-manager-
        ordering = ("-created",)
        verbose_name = _("document")
        verbose_name_plural = _("documents")
+        indexes = [
+            models.Index(fields=["owner", "created"]),
+        ]
        constraints = [
            models.UniqueConstraint(
                fields=["root_document", "version_index"],
@@ -1190,6 +1194,12 @@ class CustomFieldInstance(SoftDeleteModel):
        ordering = ("created",)
        verbose_name = _("custom field instance")
        verbose_name_plural = _("custom field instances")
+        indexes = [
+            models.Index(fields=["field", "value_date"]),
+            models.Index(fields=["field", "value_int"]),
+            models.Index(fields=["field", "value_float"]),
+            models.Index(fields=["field", "value_monetary_amount"]),
+        ]
        constraints = [
            models.UniqueConstraint(
                fields=["document", "field"],
@@ -1,5 +1,6 @@
 from __future__ import annotations

+import datetime
 from typing import TYPE_CHECKING
 from unittest import TestCase
 from unittest import mock
@@ -10,6 +11,7 @@ from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.utils import timezone
 from rest_framework import status
 from rest_framework.test import APITestCase

@@ -137,6 +139,8 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
            root_document=root,
            content="v2-content",
        )
+        original_modified = timezone.now() - datetime.timedelta(days=1)
+        Document.objects.filter(pk=root.pk).update(modified=original_modified)

        with mock.patch("documents.search.get_backend"):
            resp = self.client.delete(f"/api/documents/{root.id}/versions/{v2.id}/")
@@ -146,6 +150,7 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
        self.assertEqual(resp.data["current_version_id"], v1.id)
        root.refresh_from_db()
        self.assertEqual(root.content, "root-content")
+        self.assertGreater(root.modified, original_modified)

        with mock.patch("documents.search.get_backend"):
            resp = self.client.delete(f"/api/documents/{root.id}/versions/{v1.id}/")
@@ -326,6 +331,8 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
            root_document=root,
            version_label="old",
        )
+        original_modified = timezone.now() - datetime.timedelta(days=1)
+        Document.objects.filter(pk=root.pk).update(modified=original_modified)

        resp = self.client.patch(
            f"/api/documents/{root.id}/versions/{version.id}/",
@@ -339,6 +346,8 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
        self.assertEqual(resp.data["version_label"], "Label 1")
        self.assertEqual(resp.data["id"], version.id)
        self.assertFalse(resp.data["is_root"])
+        root.refresh_from_db()
+        self.assertGreater(root.modified, original_modified)

    def test_update_version_label_clears_on_blank(self) -> None:
        root = Document.objects.create(
@@ -1241,7 +1241,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
            ],
        )

-    def test_list_with_include_selection_data(self) -> None:
+    def test_selection_data_endpoint(self) -> None:
        correspondent = Correspondent.objects.create(name="c1")
        doc_type = DocumentType.objects.create(name="dt1")
        storage_path = StoragePath.objects.create(name="sp1")
@@ -1259,30 +1259,28 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
        non_matching_doc.tags.add(Tag.objects.create(name="other"))

        response = self.client.get(
-            f"/api/documents/?tags__id__in={tag.id}&include_selection_data=true",
+            f"/api/documents/filter_selection_data/?tags__id__in={tag.id}",
        )

        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIn("selection_data", response.data)
+        self.assertNotIn("results", response.data)

        selected_correspondent = next(
            item
-            for item in response.data["selection_data"]["selected_correspondents"]
+            for item in response.data["selected_correspondents"]
            if item["id"] == correspondent.id
        )
        selected_tag = next(
-            item
-            for item in response.data["selection_data"]["selected_tags"]
-            if item["id"] == tag.id
+            item for item in response.data["selected_tags"] if item["id"] == tag.id
        )
        selected_type = next(
            item
-            for item in response.data["selection_data"]["selected_document_types"]
+            for item in response.data["selected_document_types"]
            if item["id"] == doc_type.id
        )
        selected_storage_path = next(
            item
-            for item in response.data["selection_data"]["selected_storage_paths"]
+            for item in response.data["selected_storage_paths"]
            if item["id"] == storage_path.id
        )

@@ -1291,6 +1289,17 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
        self.assertEqual(selected_type["document_count"], 1)
        self.assertEqual(selected_storage_path["document_count"], 1)

+    def test_list_no_longer_supports_include_selection_data(self) -> None:
+        """
+        include_selection_data was never part of a stable release (beta-only,
+        introduced and removed within the 3.0.0-beta cycle) -- the plain list
+        endpoint should just ignore the param now rather than compute it inline.
+        """
+        response = self.client.get("/api/documents/?include_selection_data=true")
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertNotIn("selection_data", response.data)
+
    def test_statistics(self) -> None:
        doc1 = Document.objects.create(
            title="none1",
@@ -767,6 +767,8 @@ class TestConsumer(
        root_doc.archive_serial_number = 42
        root_doc.save()

+        original_modified = timezone.now() - datetime.timedelta(days=1)
+        Document.objects.filter(pk=root_doc.pk).update(modified=original_modified)
        actor = User.objects.create_user(
            username="actor",
            email="actor@example.com",
@@ -818,6 +820,8 @@ class TestConsumer(
        self.assertIsNone(version.archive_serial_number)
        self.assertEqual(version.original_filename, version_file.name)
        self.assertTrue(bool(version.content))
+        root_doc.refresh_from_db()
+        self.assertGreater(root_doc.modified, original_modified)

    @override_settings(AUDIT_LOG_ENABLED=True)
    @mock.patch("documents.consumer.load_classifier")
@@ -1,8 +1,12 @@
 from datetime import timedelta
 from types import SimpleNamespace
+from typing import TYPE_CHECKING
+from typing import cast
 from unittest import mock

+from django.db import connection
 from django.test import TestCase
+from django.test.utils import CaptureQueriesContext
 from django.utils import timezone

 from documents.conditionals import metadata_etag
@@ -13,6 +17,9 @@ from documents.models import Document
 from documents.tests.utils import DirectoriesMixin
 from documents.versioning import resolve_effective_document_by_pk

+if TYPE_CHECKING:
+    from rest_framework.request import Request
+

 class TestConditionals(DirectoriesMixin, TestCase):
    def test_metadata_etag_uses_latest_version_for_root_request(self) -> None:
@@ -29,14 +36,18 @@ class TestConditionals(DirectoriesMixin, TestCase):
            mime_type="application/pdf",
            root_document=root,
        )
-        request = SimpleNamespace(query_params={})
+        request = cast("Request", SimpleNamespace(query_params={}))

        self.assertEqual(
            metadata_etag(request, root.id),
            f"{latest.checksum}:{latest.modified.isoformat()}",
        )
-        self.assertEqual(preview_etag(request, root.id), latest.archive_checksum)
-        self.assertEqual(thumbnail_etag(request, root.id), latest.checksum)
+        # preview_etag/thumbnail_etag resolve the same (pk, request) and should
+        # reuse metadata_etag's cached resolution instead of re-querying.
+        with CaptureQueriesContext(connection) as ctx:
+            self.assertEqual(preview_etag(request, root.id), latest.archive_checksum)
+            self.assertEqual(thumbnail_etag(request, root.id), latest.checksum)
+        self.assertEqual(len(ctx.captured_queries), 0)

    def test_metadata_etag_changes_when_document_modified_changes(self) -> None:
        doc = Document.objects.create(
@@ -44,15 +55,20 @@ class TestConditionals(DirectoriesMixin, TestCase):
            checksum="same-checksum",
            mime_type="application/pdf",
        )
-        request = SimpleNamespace(query_params={})
-
-        original_etag = metadata_etag(request, doc.id)
+        # Each call simulates a separate incoming HTTP request, so it gets its
+        # own request object -- the per-request resolution cache must not leak
+        # a stale result across genuinely different requests.
+        original_etag = metadata_etag(
+            cast("Request", SimpleNamespace(query_params={})),
+            doc.id,
+        )
        new_modified = timezone.now() + timedelta(seconds=5)
        Document.objects.filter(id=doc.id).update(modified=new_modified)

-        self.assertNotEqual(metadata_etag(request, doc.id), original_etag)
+        second_request = cast("Request", SimpleNamespace(query_params={}))
+        self.assertNotEqual(metadata_etag(second_request, doc.id), original_etag)
        self.assertEqual(
-            metadata_etag(request, doc.id),
+            metadata_etag(second_request, doc.id),
            f"{doc.checksum}:{new_modified.isoformat()}",
        )

@@ -76,9 +92,13 @@ class TestConditionals(DirectoriesMixin, TestCase):
            root_document=other_root,
        )

-        invalid_request = SimpleNamespace(query_params={"version": "not-a-number"})
-        unrelated_request = SimpleNamespace(
-            query_params={"version": str(other_version.id)},
+        invalid_request = cast(
+            "Request",
+            SimpleNamespace(query_params={"version": "not-a-number"}),
+        )
+        unrelated_request = cast(
+            "Request",
+            SimpleNamespace(query_params={"version": str(other_version.id)}),
        )

        self.assertIsNone(
@@ -105,7 +125,7 @@ class TestConditionals(DirectoriesMixin, TestCase):
        latest.thumbnail_path.parent.mkdir(parents=True, exist_ok=True)
        latest.thumbnail_path.write_bytes(b"thumb")

-        request = SimpleNamespace(query_params={})
+        request = cast("Request", SimpleNamespace(query_params={}))
        with mock.patch(
            "documents.conditionals.get_thumbnail_modified_key",
            return_value="thumb-modified-key",
@@ -177,6 +177,49 @@ class TestViews(DirectoriesMixin, TestCase):
        self.assertEqual(response.request["PATH_INFO"], "/accounts/login/")
        self.assertContains(response, b"Share link has expired")

+    def test_share_link_archive_falls_back_to_original(self) -> None:
+        """
+        GIVEN:
+            - A document without an archive version
+            - A share link using the default archive file version
+        WHEN:
+            - An unauthenticated request for the share link is made
+        THEN:
+            - The original document is returned
+        """
+        _, filename = tempfile.mkstemp(dir=self.dirs.originals_dir)
+        content = b"This document has no archive"
+
+        with Path(filename).open("wb") as f:
+            f.write(content)
+
+        doc = Document.objects.create(
+            title="no archive",
+            filename=Path(filename).name,
+            mime_type="text/plain",
+        )
+
+        sharelink_permissions = Permission.objects.filter(
+            codename__contains="sharelink",
+        )
+        self.user.user_permissions.add(*sharelink_permissions)
+        self.client.force_login(self.user)
+
+        create_response = self.client.post(
+            "/api/share_links/",
+            {"document": doc.pk},
+        )
+        self.assertEqual(create_response.status_code, status.HTTP_201_CREATED)
+        share_link = ShareLink.objects.get(document=doc)
+        self.assertEqual(share_link.file_version, ShareLink.FileVersion.ARCHIVE)
+
+        self.client.logout()
+
+        response = self.client.get(f"/share/{share_link.slug}")
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(read_streaming_response(response), content)
+
    def test_list_with_full_permissions(self) -> None:
        """
        GIVEN:
@@ -2938,6 +2938,69 @@ class TestWorkflows(
        self.assertFalse(doc.tags.filter(pk=self.t1.pk).exists())
        self.assertTrue(doc.tags.filter(pk=self.t2.pk).exists())

+    def test_document_updated_workflow_assignment_storage_path_persists_with_tag_assignment(
+        self,
+    ) -> None:
+        """
+        GIVEN:
+            - A document updated workflow filtered on a tag
+            - One assignment action assigns a storage path, a second (later-ordered)
+              assignment action adds a tag
+        WHEN:
+            - The document is updated and the workflow is triggered
+        THEN:
+            - Both the tag and the storage path are persisted
+        """
+        trigger = WorkflowTrigger.objects.create(
+            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
+        )
+        trigger.filter_has_tags.add(self.t1)
+        assign_storage_path = WorkflowAction.objects.create(
+            type=WorkflowAction.WorkflowActionType.ASSIGNMENT,
+            assign_storage_path=self.sp,
+            order=0,
+        )
+        assign_tag = WorkflowAction.objects.create(
+            type=WorkflowAction.WorkflowActionType.ASSIGNMENT,
+            order=1,
+        )
+        assign_tag.assign_tags.add(self.t2)
+        assign_tag.save()
+
+        workflow = Workflow.objects.create(
+            name="Workflow assign storage path then tag",
+            order=0,
+        )
+        workflow.triggers.add(trigger)
+        workflow.actions.add(assign_storage_path, assign_tag)
+        workflow.save()
+
+        doc = Document.objects.create(
+            title="sample test",
+            mime_type="application/pdf",
+            checksum="assign-tag-and-storage-path",
+            original_filename="sample.pdf",
+        )
+        generated = generate_unique_filename(doc)
+        destination = (settings.ORIGINALS_DIR / generated).resolve()
+        create_source_path_directory(destination)
+        shutil.copy(self.SAMPLE_DIR / "simple.pdf", destination)
+        Document.objects.filter(pk=doc.pk).update(filename=generated.as_posix())
+        doc.refresh_from_db()
+        doc.tags.set([self.t1])
+
+        superuser = User.objects.create_superuser("superuser")
+        self.client.force_authenticate(user=superuser)
+        self.client.patch(
+            f"/api/documents/{doc.id}/",
+            {"title": "user update to trigger workflow"},
+            format="json",
+        )
+
+        doc.refresh_from_db()
+        self.assertEqual(doc.storage_path, self.sp)
+        self.assertTrue(doc.tags.filter(pk=self.t2.pk).exists())
+
    def test_removal_action_document_updated_removeall(self) -> None:
        """
        GIVEN:
@@ -8,7 +8,7 @@ from typing import Any
 from documents.models import Document

 if TYPE_CHECKING:
-    from django.http import HttpRequest
+    from rest_framework.request import Request


 class VersionResolutionError(StrEnum):
@@ -26,7 +26,7 @@ def _document_manager(*, include_deleted: bool) -> Any:
    return Document.global_objects if include_deleted else Document.objects


-def get_request_version_param(request: HttpRequest) -> str | None:
+def get_request_version_param(request: Request) -> str | None:
    if hasattr(request, "query_params"):
        return request.query_params.get("version")
    return None
@@ -57,7 +57,7 @@ def get_latest_version_for_root(

 def resolve_requested_version_for_root(
    root_doc: Document,
-    request: Any,
+    request: Request,
    *,
    include_deleted: bool = False,
 ) -> VersionResolution:
@@ -86,7 +86,7 @@ def resolve_requested_version_for_root(

 def resolve_effective_document(
    request_doc: Document,
-    request: Any,
+    request: Request,
    *,
    include_deleted: bool = False,
 ) -> VersionResolution:
@@ -107,18 +107,41 @@ def resolve_effective_document(
    return VersionResolution(document=request_doc)


+_EFFECTIVE_DOCUMENT_CACHE_ATTR = "_effective_document_resolution_cache"
+
+
 def resolve_effective_document_by_pk(
    pk: int,
-    request: Any,
+    request: Request,
    *,
    include_deleted: bool = False,
 ) -> VersionResolution:
+    # Django's `condition()` decorator (used for ETag/Last-Modified) invokes the
+    # etag_func and last_modified_func separately, and the view itself may resolve
+    # again -- all against the same request. Cache per-request so a single thumb/
+    # metadata/preview request doesn't redo this resolution multiple times.
+    cache = getattr(request, _EFFECTIVE_DOCUMENT_CACHE_ATTR, None)
+    if cache is None:
+        cache = {}
+        setattr(request, _EFFECTIVE_DOCUMENT_CACHE_ATTR, cache)
+
+    key = (pk, include_deleted)
+    if key in cache:
+        return cache[key]
+
    manager = _document_manager(include_deleted=include_deleted)
    request_doc = manager.only("id", "root_document_id").filter(pk=pk).first()
    if request_doc is None:
-        return VersionResolution(document=None, error=VersionResolutionError.NOT_FOUND)
-    return resolve_effective_document(
-        request_doc,
-        request,
-        include_deleted=include_deleted,
-    )
+        resolution = VersionResolution(
+            document=None,
+            error=VersionResolutionError.NOT_FOUND,
+        )
+    else:
+        resolution = resolve_effective_document(
+            request_doc,
+            request,
+            include_deleted=include_deleted,
+        )
+
+    cache[key] = resolution
+    return resolution
@@ -1034,7 +1034,11 @@ class DocumentViewSet(
            ],
        }

-    def get_queryset(self):
+    def _base_document_queryset(self):
+        # Root documents only, with the annotations that filter_backends rely
+        # on (effective_content for SearchFilter, num_notes for ordering) --
+        # but no select_related/prefetch_related, since those only matter for
+        # serializing documents, not for filtering, ordering, or aggregating.
        latest_version_content = Subquery(
            Document.objects.filter(root_document=OuterRef("pk"))
            .order_by("-id")
@@ -1046,6 +1050,11 @@ class DocumentViewSet(
            .order_by("-created", "-id")
            .annotate(effective_content=Coalesce(latest_version_content, F("content")))
            .annotate(num_notes=Count("notes"))
+        )
+
+    def get_queryset(self):
+        return (
+            self._base_document_queryset()
            .select_related("correspondent", "storage_path", "document_type", "owner")
            .prefetch_related(
                Prefetch(
@@ -1184,24 +1193,21 @@ class DocumentViewSet(

        return response

-    def list(self, request, *args, **kwargs):
-        if not get_boolean(
-            str(request.query_params.get("include_selection_data", "false")),
-        ):
-            return super().list(request, *args, **kwargs)
-
-        queryset = self.filter_queryset(self.get_queryset())
-        selection_data = self._get_selection_data_for_queryset(queryset)
-
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True)
-            response = self.get_paginated_response(serializer.data)
-            response.data["selection_data"] = selection_data
-            return response
-
-        serializer = self.get_serializer(queryset, many=True)
-        return Response({"results": serializer.data, "selection_data": selection_data})
+    @extend_schema(
+        operation_id="documents_filter_selection_data",
+        description=(
+            "Returns per-tag/correspondent/document-type/storage-path/custom-field "
+            "document counts for the current filter, without paginating or "
+            "serializing the matching documents themselves. Split out from the "
+            "plain document list so that browsing the (potentially huge) unfiltered "
+            "document list doesn't pay for this aggregation on every request."
+        ),
+        responses={200: inline_serializer(name="SelectionData", fields={})},
+    )
+    @action(detail=False, methods=["get"], url_path="filter_selection_data")
+    def filter_selection_data(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self._base_document_queryset())
+        return Response(self._get_selection_data_for_queryset(queryset))

    def destroy(self, request, *args, **kwargs):
        from documents.search import get_backend
@@ -2057,6 +2063,8 @@ class DocumentViewSet(
        _backend.remove(version_doc.pk)
        version_doc_id = version_doc.id
        version_doc.delete()
+        root_doc.modified = timezone.now()
+        Document.objects.filter(pk=root_doc.pk).update(modified=root_doc.modified)
        _backend.add_or_update(root_doc)
        if settings.AUDIT_LOG_ENABLED:
            actor = (
@@ -2136,6 +2144,8 @@ class DocumentViewSet(
        old_label = version_doc.version_label
        version_doc.version_label = serializer.validated_data["version_label"]
        version_doc.save(update_fields=["version_label"])
+        root_doc.modified = timezone.now()
+        Document.objects.filter(pk=root_doc.pk).update(modified=root_doc.modified)

        if settings.AUDIT_LOG_ENABLED and old_label != version_doc.version_label:
            actor = (
@@ -4534,7 +4544,8 @@ class SharedLinkView(View):
                return HttpResponseRedirect("/accounts/login/?sharelink_expired=1")
            return serve_file(
                doc=share_link.document,
-                use_archive=share_link.file_version == "archive",
+                use_archive=share_link.file_version == ShareLink.FileVersion.ARCHIVE
+                and share_link.document.has_archive_version,
                disposition="inline",
            )

@@ -24,7 +24,11 @@ def apply_assignment_to_document(
    action: WorkflowAction, annotated with 'has_assign_*' boolean fields
    """
    if action.has_assign_tags:
-        document.add_nested_tags(action.assign_tags.all())
+        # Apply to a freshly-fetched instance rather than the shared `document`.
+        # Document.tags.add() fires an m2m_changed signal that ultimately calls
+        # instance.refresh_from_db(), which would discard any other unsaved
+        # assignment fields (e.g. storage_path) already staged on `document`.
+        Document.objects.get(pk=document.pk).add_nested_tags(action.assign_tags.all())

    if action.assign_correspondent:
        document.correspondent = action.assign_correspondent
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: paperless-ngx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-07-15 20:44+0000\n"
+"POT-Creation-Date: 2026-07-19 20:55+0000\n"
 "PO-Revision-Date: 2022-02-17 04:17\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Maximum nesting depth exceeded."
 msgstr ""

-#: documents/filters.py:1052
+#: documents/filters.py:1059
 msgid "Custom field not found"
 msgstr ""

@@ -1686,11 +1686,11 @@ msgstr ""
 msgid "Bundle is already being processed."
 msgstr ""

-#: documents/views.py:4554
+#: documents/views.py:4555
 msgid "The share link bundle is still being prepared. Please try again later."
 msgstr ""

-#: documents/views.py:4564
+#: documents/views.py:4565
 msgid "The share link bundle is unavailable."
 msgstr ""
Author	SHA1	Message	Date
Trenton HolmesandClaude Sonnet 5	ff0ce4d123	Fix: register the filter_selection_data e2e stub after routeFromHAR, not before Per Playwright's own docs, routeFromHAR's notFound: 'fallback' sends unmatched requests straight to the network -- it does not chain to other, earlier-registered page.route() handlers via route.fallback() the way I'd assumed. Since Playwright checks routes in reverse-registration order, a handler registered in beforeEach (i.e. before the test body's routeFromHAR call) is checked AFTER routeFromHAR, whose catch-all pattern intercepts everything first and sends any miss straight to the (nonexistent, in e2e) network -- my stub never got a chance to run. Confirmed by a second CI failure with the same "Failed to fetch" symptom even after the CORS-header fix. Moved the mockFilterSelectionData(page) call to immediately after each test's own routeFromHAR(...) call instead, so it's registered later and checked first for that specific URL, with routeFromHAR's broader pattern still handling everything else as before. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-07-20 14:54:58 -07:00
Trenton HolmesandClaude Sonnet 5	8b3665b32d	Fix: add CORS header to the e2e filter_selection_data stub response The e2e app (localhost:4200) calls the backend at localhost:8000, a cross-origin request from the browser's perspective. Recorded HAR responses carry the real backend's Access-Control-Allow-Origin header, which is why they work; the stub added in the previous commit didn't set one, so the browser rejected the fulfilled response as a CORS violation -- same symptom as the original bug (TypeError: Failed to fetch), confirmed via a fresh CI run after the first e2e fix attempt. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-07-20 14:32:59 -07:00
Trenton HolmesandClaude Sonnet 5	9cce6d1b68	Fix: mock the new filter_selection_data request in Playwright e2e tests CI (https://github.com/paperless-ngx/paperless-ngx/actions/runs/29777331059) failed every e2e test that reloads the document list, with the browser throwing "TypeError: Failed to fetch". Root cause: the e2e harness only starts the Angular dev server (no real backend), and relies entirely on page.routeFromHAR(..., { notFound: 'fallback' }) to mock API responses, falling through to the real network for anything not in a recorded HAR. The new GET /api/documents/filter_selection_data/ request added by this branch fires on every non-search reload() and isn't in any pre-recorded HAR fixture, so it fell through to a real network call with nothing listening on the other end. Added a shared mockFilterSelectionData() helper that stubs an empty response for that endpoint, registered via test.beforeEach() before each affected test's own routeFromHAR() call in every spec file that exercises document-list reload (document-list, dashboard, global-permissions, settings, document-detail). Playwright resolves routes in reverse-registration order, so the later-registered HAR route checks first, calls route.fallback() on a miss, and defers back to this earlier-registered stub instead of hitting the network. Not verified locally (Playwright browser binaries aren't installed in this environment and the user preferred not to install them); relying on CI to confirm. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-07-20 14:21:51 -07:00
Trenton HolmesandClaude Sonnet 5	bb77e65d52	Simplify: dedup HttpParams building, fire selection-data concurrently Cleanups from a code-simplification pass over the prior commit: - Extract the repeated "build HttpParams from a plain object, skipping null/undefined" loop (previously duplicated in list(), getFew(), and the new getFilterSelectionData()) into a single shared AbstractPaperlessService.withParams() helper. - document-list-view.service.ts: fire the filter_selection_data request concurrently with the primary list request instead of nesting it inside the list request's success callback. They're independent (the follow-up only needs filterRules, not the list response), so there's no reason to wait on one before starting the other. Extracted into loadFilterSelectionData() for readability, and guarded the error path so a failed list request cancels the concurrent follow-up too rather than letting it resolve afterward and clobber the error-state reset. - views.py: give filter_selection_data a lean base queryset (_base_document_queryset) instead of the full get_queryset(), which carries select_related/prefetch_related meant for serializing full Document objects. Benchmarked this specifically: no measured query-time impact in this path, since those calls were never iterating the queryset directly and were already inert here -- keeping it for clarity, not as a performance claim. - Test fallout: since filter_selection_data now fires unconditionally on every non-search reload() rather than only after a successful primary flush, added a generic drain step to both spec files' afterEach so individual tests don't each need to know about this follow-up request unless they specifically assert on its response. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-07-20 10:00:08 -07:00
Trenton HolmesandClaude Sonnet 5	eb5bf53476	Fix (beta): stop blocking the document list on selection-data aggregation The document overview sent include_selection_data=true on every list request (page/filter/sort change), computing 5 correlated Count(DISTINCT) aggregations over the full matching queryset inline before the list could render. At scale (hundreds of thousands of documents, unfiltered) this is the confirmed root cause of the document overview "eternally loading" in paperless-ngx/paperless-ngx#13161. Split the aggregation into its own endpoint, GET /api/documents/filter_selection_data/, filter-scoped the same way the list endpoint already resolves matches (no document ID enumeration needed). The frontend now fetches it as a separate, non-blocking request after the list has already rendered, for plain (non-search) browsing. Full-text search keeps computing it inline since results are already narrowed by the search backend first. include_selection_data never shipped in a stable release (introduced this beta cycle, not present on main), so the plain list endpoint simply stops acting on it rather than needing a deprecation path. Also closes a latent localStorage leak between document-list-view.service.spec.ts tests (filterRules persisted via localStorage were never cleared, only sessionStorage was) that this change's new URL-dependent follow-up request exposed, and fixes two tests that were unknowingly relying on that leaked state to pass. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-07-20 10:00:08 -07:00
shamoonandGitHub	ff609c2987	Change: update root modified timestamp on version changes (#13170 )	2026-07-20 15:45:24 +00:00
Trenton HandGitHub	2b784e709b	Fix: prevent tag assignment from reverting other pending workflow assignments (#13178 ) apply_assignment_to_document() mutated tags directly on the shared document instance via add_nested_tags(), whose m2m_changed signal triggers update_filename_and_move_files() -> instance.refresh_from_db(), discarding any not-yet-saved fields (e.g. storage_path) staged by an earlier-ordered action in the same workflow. Apply tag changes to a freshly-fetched instance instead, matching the pattern already used in apply_removal_to_document().	2026-07-20 08:22:30 -07:00
Trenton HandGitHub	c9716252f0	Performance: Add DB indexes for common query/sort patterns (#13167 ) Adds indexes on Document.checksum, Document.page_count, and a composite (owner, created) index on Document, plus composite (field, value_*) indexes on CustomFieldInstance for each typed value column. Benchmarked against a 100k-document / 200k-custom-field-instance SQLite dataset: Document.checksum lookups ~69x faster, page_count sort ~40x, owner+created list queries ~6x. CustomFieldInstance composite indexes show large gains (10-24x) on realistic narrow-selectivity queries matching the workflow scheduler and custom-field search code paths.	2026-07-20 13:12:54 +00:00
shamoon	5cf9152a40	Merge branch 'dev' into beta	2026-07-19 20:20:48 -07:00
shamoonandGitHub	80210bd3bf	Performance: use NgOptimizedImage for thumbnail lazy loading (#13169 )	2026-07-19 18:05:51 -07:00
Trenton H GitHub Claude Sonnet 5	4e52dd5710	Fix: cache per-request effective-document resolution for thumb/metadata/preview (#13166 ) Django's condition() decorator invokes etag_func and last_modified_func separately, and the view itself may resolve again -- each call to resolve_effective_document_by_pk() was redoing the same root/version DB lookups. Memoize the resolution on the request object so a single thumb/metadata/preview request resolves the effective document once instead of up to three times. Related to paperless-ngx/paperless-ngx#13161. Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>	2026-07-19 18:04:16 -07:00
GitHub Actions	d34ef75786	Auto translate strings	2026-07-19 22:48:24 +00:00
shamoon	b8c424c8e1	Update document-detail.component.html	2026-07-19 15:46:17 -07:00
GitHub Actions	ec8991c2ec	Auto translate strings	2026-07-19 20:56:43 +00:00
shamoonandGitHub	4f6d9fa93f	Fix: dont allow archive version for share links when one doesnt exist (#13163 )	2026-07-19 20:54:58 +00:00
GitHub Actions	2180b21c41	Auto translate strings	2026-07-19 14:45:46 +00:00
shamoonandGitHub	99bdfdfe7a	Fix: better handle saved view errors in dashboard widgets (#13164 )	2026-07-19 07:44:12 -07:00
GitHub Actions	73a0586a75	Auto translate strings	2026-07-18 06:00:02 +00:00
shamoon	dcba44ad78	Merge branch 'beta' into dev	2026-07-17 22:57:47 -07:00
shamoon	ed54f1a8b9	Fix: more signal-backed conversions	2026-07-17 22:57:37 -07:00
shamoonandGitHub	f8a641b402	Fix (beta): convert chat component to signal-backed (#13152 )	2026-07-17 22:26:07 -07:00
stumpylog	e85223929c	Fix: increase checks-discovery-timeout for Wait for Docker Build The Merge and Push Manifest check isn't materialized until the build-arch matrix completes (its `if` gates on a job output), which routinely takes longer than the action's 60s discovery window, causing the release workflow to bail before Docker builds finish.	2026-07-17 15:27:55 -07:00