Locks down permissions to the job level with least privledge we can get away with

2026-03-12 12:11:24 +00:00 · 2026-03-02 10:27:54 -08:00
208 changed files with 6049 additions and 11338 deletions
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -14,6 +14,10 @@ component_management:
 # https://docs.codecov.com/docs/carryforward-flags
 flags:
  # Backend Python versions
+  backend-python-3.10:
+    paths:
+      - src/**
+    carryforward: true
  backend-python-3.11:
    paths:
      - src/**
@@ -22,14 +26,6 @@ flags:
    paths:
      - src/**
    carryforward: true
-  backend-python-3.13:
-    paths:
-      - src/**
-    carryforward: true
-  backend-python-3.14:
-    paths:
-      - src/**
-    carryforward: true
  # Frontend (shards merge into single flag)
  frontend-node-24.x:
    paths:
@@ -45,10 +41,9 @@ coverage:
    project:
      backend:
        flags:
+          - backend-python-3.10
          - backend-python-3.11
          - backend-python-3.12
-          - backend-python-3.13
-          - backend-python-3.14
        paths:
          - src/**
        # https://docs.codecov.com/docs/commit-status#threshold
@@ -64,10 +59,9 @@ coverage:
    patch:
      backend:
        flags:
+          - backend-python-3.10
          - backend-python-3.11
          - backend-python-3.12
-          - backend-python-3.13
-          - backend-python-3.14
        paths:
          - src/**
        target: 100%
--- a/.github/workflows/ci-backend.yml
+++ b/.github/workflows/ci-backend.yml
@@ -3,86 +3,53 @@ on:
  push:
    branches-ignore:
      - 'translations**'
+    paths:
+      - 'src/**'
+      - 'pyproject.toml'
+      - 'uv.lock'
+      - 'docker/compose/docker-compose.ci-test.yml'
+      - '.github/workflows/ci-backend.yml'
  pull_request:
    branches-ignore:
      - 'translations**'
+    paths:
+      - 'src/**'
+      - 'pyproject.toml'
+      - 'uv.lock'
+      - 'docker/compose/docker-compose.ci-test.yml'
+      - '.github/workflows/ci-backend.yml'
  workflow_dispatch:
 concurrency:
  group: backend-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
+permissions: {}
 env:
  DEFAULT_UV_VERSION: "0.10.x"
  NLTK_DATA: "/usr/share/nltk_data"
 jobs:
-  changes:
-    name: Detect Backend Changes
-    runs-on: ubuntu-slim
-    outputs:
-      backend_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.backend == 'true' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6.0.2
-        with:
-          fetch-depth: 0
-      - name: Decide run mode
-        id: force
-        run: |
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "run_all=true" >> "$GITHUB_OUTPUT"
-          elif [[ "${{ github.event_name }}" == "push" && ( "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "dev" ) ]]; then
-            echo "run_all=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "run_all=false" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Set diff range
-        id: range
-        if: steps.force.outputs.run_all != 'true'
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            echo "base=${{ github.event.pull_request.base.sha }}" >> "$GITHUB_OUTPUT"
-          elif [[ "${{ github.event.created }}" == "true" ]]; then
-            echo "base=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
-          else
-            echo "base=${{ github.event.before }}" >> "$GITHUB_OUTPUT"
-          fi
-          echo "ref=${{ github.sha }}" >> "$GITHUB_OUTPUT"
-      - name: Detect changes
-        id: filter
-        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@v3.0.2
-        with:
-          base: ${{ steps.range.outputs.base }}
-          ref: ${{ steps.range.outputs.ref }}
-          filters: |
-            backend:
-              - 'src/**'
-              - 'pyproject.toml'
-              - 'uv.lock'
-              - 'docker/compose/docker-compose.ci-test.yml'
-              - '.github/workflows/ci-backend.yml'
  test:
-    needs: changes
-    if: needs.changes.outputs.backend_changed == 'true'
    name: "Python ${{ matrix.python-version }}"
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    strategy:
      matrix:
-        python-version: ['3.11', '3.12', '3.13', '3.14']
+        python-version: ['3.10', '3.11', '3.12']
      fail-fast: false
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
      - name: Start containers
        run: |
          docker compose --file docker/compose/docker-compose.ci-test.yml pull --quiet
          docker compose --file docker/compose/docker-compose.ci-test.yml up --detach
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@v6.2.0
+        uses: actions/setup-python@v6
        with:
          python-version: "${{ matrix.python-version }}"
      - name: Install uv
-        uses: astral-sh/setup-uv@v7.3.1
+        uses: astral-sh/setup-uv@v7
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -119,13 +86,13 @@ jobs:
            pytest
      - name: Upload test results to Codecov
        if: always()
-        uses: codecov/codecov-action@v5.5.2
+        uses: codecov/codecov-action@v5
        with:
          flags: backend-python-${{ matrix.python-version }}
          files: junit.xml
          report_type: test_results
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.5.2
+        uses: codecov/codecov-action@v5
        with:
          flags: backend-python-${{ matrix.python-version }}
          files: coverage.xml
@@ -136,22 +103,22 @@ jobs:
          docker compose --file docker/compose/docker-compose.ci-test.yml logs
          docker compose --file docker/compose/docker-compose.ci-test.yml down
  typing:
-    needs: changes
-    if: needs.changes.outputs.backend_changed == 'true'
    name: Check project typing
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    env:
      DEFAULT_PYTHON: "3.12"
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.1
      - name: Set up Python
        id: setup-python
        uses: actions/setup-python@v6.2.0
        with:
          python-version: "${{ env.DEFAULT_PYTHON }}"
      - name: Install uv
-        uses: astral-sh/setup-uv@v7.3.1
+        uses: astral-sh/setup-uv@v7.2.1
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -188,27 +155,3 @@ jobs:
            --show-error-codes \
            --warn-unused-configs \
            src/ | uv run mypy-baseline filter
-  gate:
-    name: Backend CI Gate
-    needs: [changes, test, typing]
-    if: always()
-    runs-on: ubuntu-slim
-    steps:
-      - name: Check gate
-        run: |
-          if [[ "${{ needs.changes.outputs.backend_changed }}" != "true" ]]; then
-            echo "No backend-relevant changes detected."
-            exit 0
-          fi
-
-          if [[ "${{ needs.test.result }}" != "success" ]]; then
-            echo "::error::Backend test job result: ${{ needs.test.result }}"
-            exit 1
-          fi
-
-          if [[ "${{ needs.typing.result }}" != "success" ]]; then
-            echo "::error::Backend typing job result: ${{ needs.typing.result }}"
-            exit 1
-          fi
-
-          echo "Backend checks passed."
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -15,6 +15,7 @@ on:
 concurrency:
  group: docker-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
+permissions: {}
 env:
  REGISTRY: ghcr.io
 jobs:
@@ -41,7 +42,7 @@ jobs:
      ref-name: ${{ steps.ref.outputs.name }}
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.1
      - name: Determine ref name
        id: ref
        run: |
@@ -130,7 +131,7 @@ jobs:
            type=semver,pattern={{major}}.{{minor}}
      - name: Build and push by digest
        id: build
-        uses: docker/build-push-action@v6.19.2
+        uses: docker/build-push-action@v6.18.0
        with:
          context: .
          file: ./Dockerfile
@@ -149,16 +150,15 @@ jobs:
          mkdir -p /tmp/digests
          digest="${{ steps.build.outputs.digest }}"
          echo "digest=${digest}"
-          echo "${digest}" > "/tmp/digests/digest-${{ matrix.arch }}.txt"
+          touch "/tmp/digests/${digest#sha256:}"
      - name: Upload digest
        if: steps.check-push.outputs.should-push == 'true'
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v6.0.0
        with:
          name: digests-${{ matrix.arch }}
-          path: /tmp/digests/digest-${{ matrix.arch }}.txt
+          path: /tmp/digests/*
          if-no-files-found: error
          retention-days: 1
-          archive: false
  merge-and-push:
    name: Merge and Push Manifest
    runs-on: ubuntu-24.04
@@ -169,10 +169,10 @@ jobs:
      packages: write
    steps:
      - name: Download digests
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v7.0.0
        with:
          path: /tmp/digests
-          pattern: digest-*.txt
+          pattern: digests-*
          merge-multiple: true
      - name: List digests
        run: |
@@ -218,9 +218,8 @@ jobs:
          tags=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "${DOCKER_METADATA_OUTPUT_JSON}")

          digests=""
-          for digest_file in digest-*.txt; do
-            digest=$(cat "${digest_file}")
-            digests+="${{ env.REGISTRY }}/${REPOSITORY}@${digest} "
+          for digest in *; do
+            digests+="${{ env.REGISTRY }}/${REPOSITORY}@sha256:${digest} "
          done

          echo "Creating manifest with tags: ${tags}"
--- a/.github/workflows/ci-docs.yml
+++ b/.github/workflows/ci-docs.yml
@@ -1,83 +1,47 @@
 name: Documentation
 on:
  push:
-    branches-ignore:
-      - 'translations**'
+    branches:
+      - main
+      - dev
+    paths:
+      - 'docs/**'
+      - 'zensical.toml'
+      - 'pyproject.toml'
+      - 'uv.lock'
+      - '.github/workflows/ci-docs.yml'
  pull_request:
+    paths:
+      - 'docs/**'
+      - 'zensical.toml'
+      - 'pyproject.toml'
+      - 'uv.lock'
+      - '.github/workflows/ci-docs.yml'
  workflow_dispatch:
 concurrency:
  group: docs-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
-permissions:
-  contents: read
-  pages: write
-  id-token: write
+permissions: {}
 env:
  DEFAULT_UV_VERSION: "0.10.x"
  DEFAULT_PYTHON_VERSION: "3.12"
 jobs:
-  changes:
-    name: Detect Docs Changes
-    runs-on: ubuntu-slim
-    outputs:
-      docs_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.docs == 'true' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6.0.2
-        with:
-          fetch-depth: 0
-      - name: Decide run mode
-        id: force
-        run: |
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "run_all=true" >> "$GITHUB_OUTPUT"
-          elif [[ "${{ github.event_name }}" == "push" && ( "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "dev" ) ]]; then
-            echo "run_all=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "run_all=false" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Set diff range
-        id: range
-        if: steps.force.outputs.run_all != 'true'
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            echo "base=${{ github.event.pull_request.base.sha }}" >> "$GITHUB_OUTPUT"
-          elif [[ "${{ github.event.created }}" == "true" ]]; then
-            echo "base=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
-          else
-            echo "base=${{ github.event.before }}" >> "$GITHUB_OUTPUT"
-          fi
-          echo "ref=${{ github.sha }}" >> "$GITHUB_OUTPUT"
-      - name: Detect changes
-        id: filter
-        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@v3.0.2
-        with:
-          base: ${{ steps.range.outputs.base }}
-          ref: ${{ steps.range.outputs.ref }}
-          filters: |
-            docs:
-              - 'docs/**'
-              - 'zensical.toml'
-              - 'pyproject.toml'
-              - 'uv.lock'
-              - '.github/workflows/ci-docs.yml'
  build:
-    needs: changes
-    if: needs.changes.outputs.docs_changed == 'true'
    name: Build Documentation
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    steps:
-      - uses: actions/configure-pages@v5.0.0
+      - uses: actions/configure-pages@v5
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@v6.2.0
+        uses: actions/setup-python@v6
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@v7.3.1
+        uses: astral-sh/setup-uv@v7
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -93,40 +57,25 @@ jobs:
            --frozen \
            zensical build --clean
      - name: Upload GitHub Pages artifact
-        uses: actions/upload-pages-artifact@v4.0.0
+        uses: actions/upload-pages-artifact@v4
        with:
          path: site
          name: github-pages-${{ github.run_id }}-${{ github.run_attempt }}
  deploy:
    name: Deploy Documentation
-    needs: [changes, build]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.changes.outputs.docs_changed == 'true'
+    needs: build
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
    environment:
      name: github-pages
      url: ${{ steps.deployment.outputs.page_url }}
    steps:
      - name: Deploy GitHub Pages
-        uses: actions/deploy-pages@v4.0.5
+        uses: actions/deploy-pages@v4
        id: deployment
        with:
          artifact_name: github-pages-${{ github.run_id }}-${{ github.run_attempt }}
-  gate:
-    name: Docs CI Gate
-    needs: [changes, build]
-    if: always()
-    runs-on: ubuntu-slim
-    steps:
-      - name: Check gate
-        run: |
-          if [[ "${{ needs.changes.outputs.docs_changed }}" != "true" ]]; then
-            echo "No docs-relevant changes detected."
-            exit 0
-          fi
-
-          if [[ "${{ needs.build.result }}" != "success" ]]; then
-            echo "::error::Docs build job result: ${{ needs.build.result }}"
-            exit 1
-          fi
-
-          echo "Docs checks passed."
--- a/.github/workflows/ci-frontend.yml
+++ b/.github/workflows/ci-frontend.yml
@@ -3,78 +3,42 @@ on:
  push:
    branches-ignore:
      - 'translations**'
+    paths:
+      - 'src-ui/**'
+      - '.github/workflows/ci-frontend.yml'
  pull_request:
    branches-ignore:
      - 'translations**'
+    paths:
+      - 'src-ui/**'
+      - '.github/workflows/ci-frontend.yml'
  workflow_dispatch:
 concurrency:
  group: frontend-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
+permissions: {}
 jobs:
-  changes:
-    name: Detect Frontend Changes
-    runs-on: ubuntu-slim
-    outputs:
-      frontend_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.frontend == 'true' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6.0.2
-        with:
-          fetch-depth: 0
-      - name: Decide run mode
-        id: force
-        run: |
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "run_all=true" >> "$GITHUB_OUTPUT"
-          elif [[ "${{ github.event_name }}" == "push" && ( "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "dev" ) ]]; then
-            echo "run_all=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "run_all=false" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Set diff range
-        id: range
-        if: steps.force.outputs.run_all != 'true'
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            echo "base=${{ github.event.pull_request.base.sha }}" >> "$GITHUB_OUTPUT"
-          elif [[ "${{ github.event.created }}" == "true" ]]; then
-            echo "base=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
-          else
-            echo "base=${{ github.event.before }}" >> "$GITHUB_OUTPUT"
-          fi
-          echo "ref=${{ github.sha }}" >> "$GITHUB_OUTPUT"
-      - name: Detect changes
-        id: filter
-        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@v3.0.2
-        with:
-          base: ${{ steps.range.outputs.base }}
-          ref: ${{ steps.range.outputs.ref }}
-          filters: |
-            frontend:
-              - 'src-ui/**'
-              - '.github/workflows/ci-frontend.yml'
  install-dependencies:
-    needs: changes
-    if: needs.changes.outputs.frontend_changed == 'true'
    name: Install Dependencies
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
      - name: Install pnpm
-        uses: pnpm/action-setup@v4.2.0
+        uses: pnpm/action-setup@v4
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
        id: cache-frontend-deps
-        uses: actions/cache@v5.0.3
+        uses: actions/cache@v5
        with:
          path: |
            ~/.pnpm-store
@@ -84,24 +48,25 @@ jobs:
        run: cd src-ui && pnpm install
  lint:
    name: Lint
-    needs: [changes, install-dependencies]
-    if: needs.changes.outputs.frontend_changed == 'true'
+    needs: install-dependencies
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
      - name: Install pnpm
-        uses: pnpm/action-setup@v4.2.0
+        uses: pnpm/action-setup@v4
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
-        uses: actions/cache@v5.0.3
+        uses: actions/cache@v5
        with:
          path: |
            ~/.pnpm-store
@@ -113,9 +78,10 @@ jobs:
        run: cd src-ui && pnpm run lint
  unit-tests:
    name: "Unit Tests (${{ matrix.shard-index }}/${{ matrix.shard-count }})"
-    needs: [changes, install-dependencies]
-    if: needs.changes.outputs.frontend_changed == 'true'
+    needs: install-dependencies
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    strategy:
      fail-fast: false
      matrix:
@@ -124,19 +90,19 @@ jobs:
        shard-count: [4]
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
      - name: Install pnpm
-        uses: pnpm/action-setup@v4.2.0
+        uses: pnpm/action-setup@v4
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
-        uses: actions/cache@v5.0.3
+        uses: actions/cache@v5
        with:
          path: |
            ~/.pnpm-store
@@ -148,21 +114,22 @@ jobs:
        run: cd src-ui && pnpm run test --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
      - name: Upload test results to Codecov
        if: always()
-        uses: codecov/codecov-action@v5.5.2
+        uses: codecov/codecov-action@v5
        with:
          flags: frontend-node-${{ matrix.node-version }}
          directory: src-ui/
          report_type: test_results
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.5.2
+        uses: codecov/codecov-action@v5
        with:
          flags: frontend-node-${{ matrix.node-version }}
          directory: src-ui/coverage/
  e2e-tests:
    name: "E2E Tests (${{ matrix.shard-index }}/${{ matrix.shard-count }})"
-    needs: [changes, install-dependencies]
-    if: needs.changes.outputs.frontend_changed == 'true'
+    needs: install-dependencies
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    container: mcr.microsoft.com/playwright:v1.58.2-noble
    env:
      PLAYWRIGHT_BROWSERS_PATH: /ms-playwright
@@ -175,19 +142,19 @@ jobs:
        shard-count: [2]
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
      - name: Install pnpm
-        uses: pnpm/action-setup@v4.2.0
+        uses: pnpm/action-setup@v4
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
-        uses: actions/cache@v5.0.3
+        uses: actions/cache@v5
        with:
          path: |
            ~/.pnpm-store
@@ -201,26 +168,25 @@ jobs:
        run: cd src-ui && pnpm exec playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
  bundle-analysis:
    name: Bundle Analysis
-    needs: [changes, unit-tests, e2e-tests]
-    if: needs.changes.outputs.frontend_changed == 'true'
+    needs: [unit-tests, e2e-tests]
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
-        with:
-          fetch-depth: 2
+        uses: actions/checkout@v6
      - name: Install pnpm
-        uses: pnpm/action-setup@v4.2.0
+        uses: pnpm/action-setup@v4
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
-        uses: actions/cache@v5.0.3
+        uses: actions/cache@v5
        with:
          path: |
            ~/.pnpm-store
@@ -232,42 +198,3 @@ jobs:
        env:
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
        run: cd src-ui && pnpm run build --configuration=production
-  gate:
-    name: Frontend CI Gate
-    needs: [changes, install-dependencies, lint, unit-tests, e2e-tests, bundle-analysis]
-    if: always()
-    runs-on: ubuntu-slim
-    steps:
-      - name: Check gate
-        run: |
-          if [[ "${{ needs.changes.outputs.frontend_changed }}" != "true" ]]; then
-            echo "No frontend-relevant changes detected."
-            exit 0
-          fi
-
-          if [[ "${{ needs['install-dependencies'].result }}" != "success" ]]; then
-            echo "::error::Frontend install job result: ${{ needs['install-dependencies'].result }}"
-            exit 1
-          fi
-
-          if [[ "${{ needs.lint.result }}" != "success" ]]; then
-            echo "::error::Frontend lint job result: ${{ needs.lint.result }}"
-            exit 1
-          fi
-
-          if [[ "${{ needs['unit-tests'].result }}" != "success" ]]; then
-            echo "::error::Frontend unit-tests job result: ${{ needs['unit-tests'].result }}"
-            exit 1
-          fi
-
-          if [[ "${{ needs['e2e-tests'].result }}" != "success" ]]; then
-            echo "::error::Frontend e2e-tests job result: ${{ needs['e2e-tests'].result }}"
-            exit 1
-          fi
-
-          if [[ "${{ needs['bundle-analysis'].result }}" != "success" ]]; then
-            echo "::error::Frontend bundle-analysis job result: ${{ needs['bundle-analysis'].result }}"
-            exit 1
-          fi
-
-          echo "Frontend checks passed."
--- a/.github/workflows/ci-lint.yml
+++ b/.github/workflows/ci-lint.yml
@@ -9,10 +9,13 @@ on:
 concurrency:
  group: lint-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
+permissions: {}
 jobs:
  lint:
    name: Linting via prek
    runs-on: ubuntu-slim
+    permissions:
+      contents: read
    steps:
      - name: Checkout
        uses: actions/checkout@v6.0.2
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -7,6 +7,7 @@ on:
 concurrency:
  group: release-${{ github.ref }}
  cancel-in-progress: false
+permissions: {}
 env:
  DEFAULT_UV_VERSION: "0.10.x"
  DEFAULT_PYTHON_VERSION: "3.12"
@@ -14,6 +15,10 @@ jobs:
  wait-for-docker:
    name: Wait for Docker Build
    runs-on: ubuntu-24.04
+    permissions:
+      # lewagon/wait-on-check-action reads workflow check runs
+      actions: read
+      contents: read
    steps:
      - name: Wait for Docker build
        uses: lewagon/wait-on-check-action@v1.5.0
@@ -26,16 +31,18 @@ jobs:
    name: Build Release
    needs: wait-for-docker
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
      # ---- Frontend Build ----
      - name: Install pnpm
-        uses: pnpm/action-setup@v4.2.0
+        uses: pnpm/action-setup@v4
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6
        with:
          node-version: 24.x
          cache: 'pnpm'
@@ -47,11 +54,11 @@ jobs:
      # ---- Backend Setup ----
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@v6.2.0
+        uses: actions/setup-python@v6
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@v7.3.1
+        uses: astral-sh/setup-uv@v7
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -118,7 +125,7 @@ jobs:
          sudo chown -R 1000:1000 paperless-ngx/
          tar -cJf paperless-ngx.tar.xz paperless-ngx/
      - name: Upload release artifact
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v6
        with:
          name: release
          path: dist/paperless-ngx.tar.xz
@@ -127,13 +134,17 @@ jobs:
    name: Publish Release
    needs: build-release
    runs-on: ubuntu-24.04
+    permissions:
+      # release-drafter reads PRs to build the changelog and creates/publishes the release
+      contents: write
+      pull-requests: read
    outputs:
      prerelease: ${{ steps.get-version.outputs.prerelease }}
      changelog: ${{ steps.create-release.outputs.body }}
      version: ${{ steps.get-version.outputs.version }}
    steps:
      - name: Download release artifact
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v7
        with:
          name: release
          path: ./
@@ -148,7 +159,7 @@ jobs:
          fi
      - name: Create release and changelog
        id: create-release
-        uses: release-drafter/release-drafter@v6.2.0
+        uses: release-drafter/release-drafter@v6
        with:
          name: Paperless-ngx ${{ steps.get-version.outputs.version }}
          tag: ${{ steps.get-version.outputs.version }}
@@ -159,7 +170,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Upload release archive
-        uses: shogo82148/actions-upload-release-asset@v1.9.2
+        uses: shogo82148/actions-upload-release-asset@v1
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          upload_url: ${{ steps.create-release.outputs.upload_url }}
@@ -174,18 +185,23 @@ jobs:
    needs: publish-release
    if: needs.publish-release.outputs.prerelease == 'false'
    runs-on: ubuntu-24.04
+    permissions:
+      # git push of the changelog branch requires contents: write
+      # github.rest.pulls.create() and github.rest.issues.addLabels() require pull-requests: write
+      contents: write
+      pull-requests: write
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
        with:
          ref: main
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@v6.2.0
+        uses: actions/setup-python@v6
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@v7.3.1
+        uses: astral-sh/setup-uv@v7
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -218,7 +234,7 @@ jobs:
          git commit -am "Changelog ${{ needs.publish-release.outputs.version }} - GHA"
          git push origin ${{ needs.publish-release.outputs.version }}-changelog
      - name: Create pull request
-        uses: actions/github-script@v8.0.0
+        uses: actions/github-script@v8
        with:
          script: |
            const { repo, owner } = context.repo;
--- a/.github/workflows/cleanup-tags.yml
+++ b/.github/workflows/cleanup-tags.yml
@@ -12,6 +12,7 @@ on:
 concurrency:
  group: registry-tags-cleanup
  cancel-in-progress: false
+permissions: {}
 jobs:
  cleanup-images:
    name: Cleanup Image Tags for ${{ matrix.primary-name }}
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -18,6 +18,7 @@ on:
    branches: [dev]
  schedule:
    - cron: '28 13 * * 5'
+permissions: {}
 jobs:
  analyze:
    name: Analyze
@@ -34,10 +35,10 @@ jobs:
        # Learn more about CodeQL language support at https://git.io/codeql-language-support
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4.32.5
+        uses: github/codeql-action/init@v4
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,4 +46,4 @@ jobs:
          # Prefix the list here with "+" to use these queries and those in the config file.
          # queries: ./path/to/local/query, your-org/your-repo/queries@main
      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4.32.5
+        uses: github/codeql-action/analyze@v4
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -6,18 +6,23 @@ on:
  push:
    paths: ['src/locale/**', 'src-ui/messages.xlf', 'src-ui/src/locale/**']
    branches: [dev]
+permissions: {}
 jobs:
  synchronize-with-crowdin:
    name: Crowdin Sync
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
+    permissions:
+      # Crowdin action pushes translation branches and creates/updates PRs via GITHUB_TOKEN
+      contents: write
+      pull-requests: write
    steps:
      - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
        with:
          token: ${{ secrets.PNGX_BOT_PAT }}
      - name: crowdin action
-        uses: crowdin/github-action@v2.15.0
+        uses: crowdin/github-action@v2
        with:
          upload_translations: false
          download_translations: true
--- a/.github/workflows/pr-bot.yml
+++ b/.github/workflows/pr-bot.yml
@@ -2,28 +2,19 @@ name: PR Bot
 on:
  pull_request_target:
    types: [opened]
+permissions: {}
 jobs:
-  anti-slop:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: write
-    steps:
-      - uses: peakoss/anti-slop@v0.2.1
-        with:
-          max-failures: 4
-          failure-add-pr-labels: 'ai'
  pr-bot:
    name: Automated PR Bot
    runs-on: ubuntu-latest
    permissions:
+      # labeler reads file paths; all steps add labels or post comments on PRs
      contents: read
      pull-requests: write
    steps:
      - name: Label PR by file path or branch name
        # see .github/labeler.yml for the labeler config
-        uses: actions/labeler@v6.0.1
+        uses: actions/labeler@v6
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Label by size
@@ -37,7 +28,7 @@ jobs:
          fail_if_xl: 'false'
          excluded_files: /\.lock$/ /\.txt$/ ^src-ui/pnpm-lock\.yaml$ ^src-ui/messages\.xlf$ ^src/locale/en_US/LC_MESSAGES/django\.po$
      - name: Label by PR title
-        uses: actions/github-script@v8.0.0
+        uses: actions/github-script@v8
        with:
          script: |
            const pr = context.payload.pull_request;
@@ -63,7 +54,7 @@ jobs:
            }
      - name: Label bot-generated PRs
        if: ${{ contains(github.actor, 'dependabot') || contains(github.actor, 'crowdin-bot') }}
-        uses: actions/github-script@v8.0.0
+        uses: actions/github-script@v8
        with:
          script: |
            const pr = context.payload.pull_request;
@@ -88,7 +79,7 @@ jobs:
            }
      - name: Welcome comment
        if: ${{ !contains(github.actor, 'bot') }}
-        uses: actions/github-script@v8.0.0
+        uses: actions/github-script@v8
        with:
          script: |
            const pr = context.payload.pull_request;
--- a/.github/workflows/project-actions.yml
+++ b/.github/workflows/project-actions.yml
@@ -7,18 +7,19 @@ on:
    branches:
      - main
      - dev
-permissions:
-  contents: read
+permissions: {}
 jobs:
  pr_opened_or_reopened:
    name: pr_opened_or_reopened
    runs-on: ubuntu-24.04
    permissions:
+      # release-drafter reads its config file from the repo
+      contents: read
      # write permission is required for autolabeler
      pull-requests: write
    if: github.event_name == 'pull_request_target' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request.user.login != 'dependabot'
    steps:
      - name: Label PR with release-drafter
-        uses: release-drafter/release-drafter@v6.2.0
+        uses: release-drafter/release-drafter@v6
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/repo-maintenance.yml
+++ b/.github/workflows/repo-maintenance.yml
@@ -3,10 +3,7 @@ on:
  schedule:
    - cron: '0 3 * * *'
  workflow_dispatch:
-permissions:
-  issues: write
-  pull-requests: write
-  discussions: write
+permissions: {}
 concurrency:
  group: lock
 jobs:
@@ -14,8 +11,11 @@ jobs:
    name: 'Stale'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
+    permissions:
+      issues: write
+      pull-requests: write
    steps:
-      - uses: actions/stale@v10.2.0
+      - uses: actions/stale@v10
        with:
          days-before-stale: 7
          days-before-close: 14
@@ -36,8 +36,12 @@ jobs:
    name: 'Lock Old Threads'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
+    permissions:
+      issues: write
+      pull-requests: write
+      discussions: write
    steps:
-      - uses: dessant/lock-threads@v6.0.0
+      - uses: dessant/lock-threads@v6
        with:
          issue-inactive-days: '30'
          pr-inactive-days: '30'
@@ -56,8 +60,10 @@ jobs:
    name: 'Close Answered Discussions'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
+    permissions:
+      discussions: write
    steps:
-      - uses: actions/github-script@v8.0.0
+      - uses: actions/github-script@v8
        with:
          script: |
            function sleep(ms) {
@@ -113,8 +119,10 @@ jobs:
    name: 'Close Outdated Discussions'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
+    permissions:
+      discussions: write
    steps:
-      - uses: actions/github-script@v8.0.0
+      - uses: actions/github-script@v8
        with:
          script: |
            function sleep(ms) {
@@ -205,8 +213,10 @@ jobs:
    name: 'Close Unsupported Feature Requests'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
+    permissions:
+      discussions: write
    steps:
-      - uses: actions/github-script@v8.0.0
+      - uses: actions/github-script@v8
        with:
          script: |
            function sleep(ms) {
--- a/.github/workflows/translate-strings.yml
+++ b/.github/workflows/translate-strings.yml
@@ -3,6 +3,7 @@ on:
  push:
    branches:
      - dev
+permissions: {}
 jobs:
  generate-translate-strings:
    name: Generate Translation Strings
@@ -11,7 +12,7 @@ jobs:
      contents: write
    steps:
      - name: Checkout code
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6
        env:
          GH_REF: ${{ github.ref }} # sonar rule:githubactions:S7630 - avoid injection
        with:
@@ -19,13 +20,13 @@ jobs:
          ref: ${{ env.GH_REF }}
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@v6.2.0
+        uses: actions/setup-python@v6
      - name: Install system dependencies
        run: |
          sudo apt-get update -qq
          sudo apt-get install -qq --no-install-recommends gettext
      - name: Install uv
-        uses: astral-sh/setup-uv@v7.3.1
+        uses: astral-sh/setup-uv@v7
        with:
          enable-cache: true
      - name: Install backend python dependencies
@@ -36,18 +37,18 @@ jobs:
      - name: Generate backend translation strings
        run: cd src/ && uv run manage.py makemessages -l en_US -i "samples*"
      - name: Install pnpm
-        uses: pnpm/action-setup@v4.2.0
+        uses: pnpm/action-setup@v4
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
        id: cache-frontend-deps
-        uses: actions/cache@v5.0.3
+        uses: actions/cache@v5
        with:
          path: |
            ~/.pnpm-store
@@ -63,7 +64,7 @@ jobs:
          cd src-ui
          pnpm run ng extract-i18n
      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v7.1.0
+        uses: stefanzweifel/git-auto-commit-action@v7
        with:
          file_pattern: 'src-ui/messages.xlf src/locale/en_US/LC_MESSAGES/django.po'
          commit_message: "Auto translate strings"
--- a/.mypy-baseline.txt
+++ b/.mypy-baseline.txt
@@ -341,9 +341,6 @@ src/documents/migrations/0001_initial.py:0: error: Skipping analyzing "multisele
 src/documents/migrations/0001_initial.py:0: error: Skipping analyzing "multiselectfield.db.fields": module is installed, but missing library stubs or py.typed marker  [import-untyped]
 src/documents/migrations/0008_sharelinkbundle.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/migrations/0008_sharelinkbundle.py:0: error: Function is missing a type annotation  [no-untyped-def]
-src/documents/migrations/0012_savedview_visibility_to_ui_settings.py:0: error: Function is missing a type annotation  [no-untyped-def]
-src/documents/migrations/0012_savedview_visibility_to_ui_settings.py:0: error: Function is missing a type annotation  [no-untyped-def]
-src/documents/migrations/0012_savedview_visibility_to_ui_settings.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
 src/documents/models.py:0: error: Argument 1 to "Path" has incompatible type "Path | None"; expected "str | PathLike[str]"  [arg-type]
 src/documents/models.py:0: error: Couldn't resolve related manager 'documents' for relation 'documents.models.Document.correspondent'.  [django-manager-missing]
 src/documents/models.py:0: error: Couldn't resolve related manager 'documents' for relation 'documents.models.Document.document_type'.  [django-manager-missing]
@@ -443,6 +440,9 @@ src/documents/permissions.py:0: error: Item "list[str]" of "Any | list[str] | Qu
 src/documents/permissions.py:0: error: Item "list[str]" of "Any | list[str] | QuerySet[User, User]" has no attribute "exists"  [union-attr]
 src/documents/permissions.py:0: error: Missing type parameters for generic type "QuerySet"  [type-arg]
 src/documents/permissions.py:0: error: Missing type parameters for generic type "dict"  [type-arg]
+src/documents/plugins/helpers.py:0: error: "Collection[str]" has no attribute "update"  [attr-defined]
+src/documents/plugins/helpers.py:0: error: Argument 1 to "send" of "BaseStatusManager" has incompatible type "dict[str, Collection[str]]"; expected "dict[str, str | int | None]"  [arg-type]
+src/documents/plugins/helpers.py:0: error: Argument 1 to "send" of "BaseStatusManager" has incompatible type "dict[str, Collection[str]]"; expected "dict[str, str | int | None]"  [arg-type]
 src/documents/plugins/helpers.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/plugins/helpers.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/plugins/helpers.py:0: error: Skipping analyzing "channels_redis.pubsub": module is installed, but missing library stubs or py.typed marker  [import-untyped]
@@ -550,7 +550,6 @@ src/documents/serialisers.py:0: error: Function is missing a type annotation  [n
 src/documents/serialisers.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/serialisers.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/serialisers.py:0: error: Function is missing a type annotation  [no-untyped-def]
-src/documents/serialisers.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/serialisers.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
 src/documents/serialisers.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
 src/documents/serialisers.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
@@ -641,7 +640,6 @@ src/documents/serialisers.py:0: error: Missing type parameters for generic type
 src/documents/serialisers.py:0: error: Missing type parameters for generic type "Serializer"  [type-arg]
 src/documents/serialisers.py:0: error: Missing type parameters for generic type "Serializer"  [type-arg]
 src/documents/serialisers.py:0: error: Missing type parameters for generic type "Serializer"  [type-arg]
-src/documents/serialisers.py:0: error: Missing type parameters for generic type "Serializer"  [type-arg]
 src/documents/serialisers.py:0: error: Missing type parameters for generic type "dict"  [type-arg]
 src/documents/serialisers.py:0: error: Missing type parameters for generic type "dict"  [type-arg]
 src/documents/serialisers.py:0: error: Need type annotation for "document"  [var-annotated]
@@ -669,6 +667,7 @@ src/documents/signals/handlers.py:0: error: Argument 3 to "validate_move" has in
 src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel"  [arg-type]
 src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel"  [arg-type]
 src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel"  [arg-type]
+src/documents/signals/handlers.py:0: error: Function is missing a return type annotation  [no-untyped-def]
 src/documents/signals/handlers.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/signals/handlers.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/signals/handlers.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
@@ -1176,14 +1175,6 @@ src/documents/tests/test_management_exporter.py:0: error: Skipping analyzing "al
 src/documents/tests/test_management_fuzzy.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/tests/test_management_retagger.py:0: error: Function is missing a return type annotation  [no-untyped-def]
 src/documents/tests/test_management_superuser.py:0: error: Function is missing a type annotation  [no-untyped-def]
-src/documents/tests/test_migration_saved_view_visibility.py:0: error: Cannot determine type of "apps"  [has-type]
-src/documents/tests/test_migration_saved_view_visibility.py:0: error: Cannot determine type of "apps"  [has-type]
-src/documents/tests/test_migration_saved_view_visibility.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
-src/documents/tests/test_migration_saved_view_visibility.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
-src/documents/tests/test_migration_saved_view_visibility.py:0: error: Incompatible types in assignment (expression has type "str", base class "TestMigrations" defined the type as "None")  [assignment]
-src/documents/tests/test_migration_saved_view_visibility.py:0: error: Incompatible types in assignment (expression has type "str", base class "TestMigrations" defined the type as "None")  [assignment]
-src/documents/tests/test_migration_saved_view_visibility.py:0: error: Incompatible types in assignment (expression has type "str", base class "TestMigrations" defined the type as "None")  [assignment]
-src/documents/tests/test_migration_saved_view_visibility.py:0: error: Incompatible types in assignment (expression has type "str", base class "TestMigrations" defined the type as "None")  [assignment]
 src/documents/tests/test_migration_share_link_bundle.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
 src/documents/tests/test_migration_share_link_bundle.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
 src/documents/tests/test_migration_share_link_bundle.py:0: error: Incompatible types in assignment (expression has type "str", base class "TestMigrations" defined the type as "None")  [assignment]
@@ -1543,6 +1534,7 @@ src/documents/views.py:0: error: "get_serializer_context" undefined in superclas
 src/documents/views.py:0: error: "object" not callable  [operator]
 src/documents/views.py:0: error: "type[Model]" has no attribute "objects"  [attr-defined]
 src/documents/views.py:0: error: Argument "path" to "EmailAttachment" has incompatible type "Path | None"; expected "Path"  [arg-type]
+src/documents/views.py:0: error: Argument 1 to "int" has incompatible type "str | None"; expected "str | Buffer | SupportsInt | SupportsIndex | SupportsTrunc"  [arg-type]
 src/documents/views.py:0: error: Argument 2 to "match_correspondents" has incompatible type "DocumentClassifier | None"; expected "DocumentClassifier"  [arg-type]
 src/documents/views.py:0: error: Argument 2 to "match_document_types" has incompatible type "DocumentClassifier | None"; expected "DocumentClassifier"  [arg-type]
 src/documents/views.py:0: error: Argument 2 to "match_storage_paths" has incompatible type "DocumentClassifier | None"; expected "DocumentClassifier"  [arg-type]
@@ -1560,6 +1552,7 @@ src/documents/views.py:0: error: Function is missing a return type annotation  [
 src/documents/views.py:0: error: Function is missing a return type annotation  [no-untyped-def]
 src/documents/views.py:0: error: Function is missing a return type annotation  [no-untyped-def]
 src/documents/views.py:0: error: Function is missing a return type annotation  [no-untyped-def]
+src/documents/views.py:0: error: Function is missing a return type annotation  [no-untyped-def]
 src/documents/views.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/views.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/views.py:0: error: Function is missing a type annotation  [no-untyped-def]
@@ -1616,8 +1609,7 @@ src/documents/views.py:0: error: Function is missing a type annotation  [no-unty
 src/documents/views.py:0: error: Function is missing a type annotation  [no-untyped-def]
 src/documents/views.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
 src/documents/views.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
-src/documents/views.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
-src/documents/views.py:0: error: Function is missing a type annotation for one or more arguments  [no-untyped-def]
+src/documents/views.py:0: error: Incompatible type for lookup 'owner': (got "User | AnonymousUser", expected "User | int | None")  [misc]
 src/documents/views.py:0: error: Incompatible types in assignment (expression has type "Any | None", variable has type "dict[Any, Any]")  [assignment]
 src/documents/views.py:0: error: Incompatible types in assignment (expression has type "QuerySet[Any, Any]", variable has type "list[Any]")  [assignment]
 src/documents/views.py:0: error: Incompatible types in assignment (expression has type "QuerySet[Any, Any]", variable has type "list[Document]")  [assignment]
@@ -1683,11 +1675,11 @@ src/documents/views.py:0: error: Value of type "Iterable[Any]" is not indexable
 src/documents/views.py:0: error: Value of type "Iterable[Any]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "Iterable[Any]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "Iterable[Any]" is not indexable  [index]
-src/documents/views.py:0: error: Value of type "Iterable[Any]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "Iterable[CustomField]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "Iterable[Group]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "Iterable[MailAccount]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "Iterable[MailRule]" is not indexable  [index]
+src/documents/views.py:0: error: Value of type "Iterable[SavedView]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "Iterable[User]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "Iterable[Workflow]" is not indexable  [index]
 src/documents/views.py:0: error: Value of type "dict[str, _PingReply] | None" is not indexable  [index]
@@ -1936,7 +1928,6 @@ src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLaye
 src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send"  [union-attr]
 src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send"  [union-attr]
 src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send"  [union-attr]
-src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send"  [union-attr]
 src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user"  [typeddict-item]
 src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user"  [typeddict-item]
 src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user"  [typeddict-item]
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -50,7 +50,7 @@ repos:
          - 'prettier-plugin-organize-imports@4.1.0'
  # Python hooks
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.5
+    rev: v0.15.0
    hooks:
      - id: ruff-check
      - id: ruff-format
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,9 +13,7 @@ If you want to implement something big:

 ## Python

-Paperless-ngx currently supports Python 3.11, 3.12, 3.13, and 3.14. As a policy, we aim to support at least the three most recent Python versions, and drop support for versions as they reach end-of-life. Older versions may be supported if dependencies permit, but this is not guaranteed.
-
-We format Python code with [ruff](https://docs.astral.sh/ruff/formatter/).
+Paperless supports python 3.10 - 3.12 at this time. We format Python code with [ruff](https://docs.astral.sh/ruff/formatter/).

 ## Branches

--- a/4
+++ b/4
@@ -30,7 +30,7 @@ RUN set -eux \
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM ghcr.io/astral-sh/uv:0.10.9-python3.12-trixie-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.10.5-python3.12-trixie-slim AS s6-overlay-base

 WORKDIR /usr/src/s6

@@ -45,7 +45,7 @@ ENV \
 ARG TARGETARCH
 ARG TARGETVARIANT
 # Lock this version
-ARG S6_OVERLAY_VERSION=3.2.2.0
+ARG S6_OVERLAY_VERSION=3.2.1.0

 ARG S6_BUILD_TIME_PKGS="curl \
                        xz-utils"
--- a/docker/compose/docker-compose.ci-test.yml
+++ b/docker/compose/docker-compose.ci-test.yml
@@ -4,7 +4,7 @@
 # correct networking for the tests
 services:
  gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.27
+    image: docker.io/gotenberg/gotenberg:8.26
    hostname: gotenberg
    container_name: gotenberg
    network_mode: host
--- a/docker/compose/docker-compose.mariadb-tika.yml
+++ b/docker/compose/docker-compose.mariadb-tika.yml
@@ -72,7 +72,7 @@ services:
      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
  gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.27
+    image: docker.io/gotenberg/gotenberg:8.26
    restart: unless-stopped
    # The gotenberg chromium route is used to convert .eml files. We do not
    # want to allow external content like tracking pixels or even javascript.
--- a/docker/compose/docker-compose.portainer.yml
+++ b/docker/compose/docker-compose.portainer.yml
@@ -56,7 +56,6 @@ services:
    environment:
      PAPERLESS_REDIS: redis://broker:6379
      PAPERLESS_DBHOST: db
-      PAPERLESS_DBENGINE: postgres
    env_file:
      - stack.env
 volumes:
--- a/docker/compose/docker-compose.postgres-tika.yml
+++ b/docker/compose/docker-compose.postgres-tika.yml
@@ -62,12 +62,11 @@ services:
    environment:
      PAPERLESS_REDIS: redis://broker:6379
      PAPERLESS_DBHOST: db
-      PAPERLESS_DBENGINE: postgresql
      PAPERLESS_TIKA_ENABLED: 1
      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
  gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.27
+    image: docker.io/gotenberg/gotenberg:8.26
    restart: unless-stopped
    # The gotenberg chromium route is used to convert .eml files. We do not
    # want to allow external content like tracking pixels or even javascript.
--- a/docker/compose/docker-compose.postgres.yml
+++ b/docker/compose/docker-compose.postgres.yml
@@ -56,7 +56,6 @@ services:
    environment:
      PAPERLESS_REDIS: redis://broker:6379
      PAPERLESS_DBHOST: db
-      PAPERLESS_DBENGINE: postgresql
 volumes:
  data:
  media:
--- a/docker/compose/docker-compose.sqlite-tika.yml
+++ b/docker/compose/docker-compose.sqlite-tika.yml
@@ -51,12 +51,11 @@ services:
    env_file: docker-compose.env
    environment:
      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_DBENGINE: sqlite
      PAPERLESS_TIKA_ENABLED: 1
      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
  gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.27
+    image: docker.io/gotenberg/gotenberg:8.26
    restart: unless-stopped
    # The gotenberg chromium route is used to convert .eml files. We do not
    # want to allow external content like tracking pixels or even javascript.
--- a/docker/compose/docker-compose.sqlite.yml
+++ b/docker/compose/docker-compose.sqlite.yml
@@ -42,7 +42,6 @@ services:
    env_file: docker-compose.env
    environment:
      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_DBENGINE: sqlite
 volumes:
  data:
  media:
--- a/docker/rootfs/etc/s6-overlay/s6-rc.d/init-migrations/run
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/init-migrations/run
@@ -10,12 +10,8 @@ cd "${PAPERLESS_SRC_DIR}"

 # The whole migrate, with flock, needs to run as the right user
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	exec s6-setlock -n "${data_dir}/migration_lock" python3 manage.py check --tag compatibility paperless
 	exec s6-setlock -n "${data_dir}/migration_lock" python3 manage.py migrate --skip-checks --no-input
 else
-	exec s6-setuidgid paperless \
-		s6-setlock -n "${data_dir}/migration_lock" \
-		python3 manage.py check --tag compatibility paperless
 	exec s6-setuidgid paperless \
 		s6-setlock -n "${data_dir}/migration_lock" \
 		python3 manage.py migrate --skip-checks --no-input
--- a/docs/advanced_usage.md
+++ b/docs/advanced_usage.md
@@ -262,10 +262,6 @@ your files differently, you can do that by adjusting the
 or using [storage paths (see below)](#storage-paths). Paperless adds the
 correct file extension e.g. `.pdf`, `.jpg` automatically.

-When a document has file versions, each version uses the same naming rules and
-storage path resolution as any other document file, with an added version suffix
-such as `_v1`, `_v2`, etc.
-
 This variable allows you to configure the filename (folders are allowed)
 using placeholders. For example, configuring this to

@@ -357,8 +353,6 @@ If paperless detects that two documents share the same filename,
 paperless will automatically append `_01`, `_02`, etc to the filename.
 This happens if all the placeholders in a filename evaluate to the same
 value.
-For versioned files, this counter is appended after the version suffix
-(for example `statement_v2_01.pdf`).

 If there are any errors in the placeholders included in `PAPERLESS_FILENAME_FORMAT`,
 paperless will fall back to using the default naming scheme instead.
--- a/docs/api.md
+++ b/docs/api.md
@@ -305,16 +305,52 @@ The following methods are supported:
        -   `"merge": true or false` (defaults to false)
    -   The `merge` flag determines if the supplied permissions will overwrite all existing permissions (including
        removing them) or be merged with existing permissions.
+-   `edit_pdf`
+    -   Requires `parameters`:
+        -   `"doc_ids": [DOCUMENT_ID]` A list of a single document ID to edit.
+        -   `"operations": [OPERATION, ...]` A list of operations to perform on the documents. Each operation is a dictionary
+            with the following keys:
+            -   `"page": PAGE_NUMBER` The page number to edit (1-based).
+            -   `"rotate": DEGREES` Optional rotation in degrees (90, 180, 270).
+            -   `"doc": OUTPUT_DOCUMENT_INDEX` Optional index of the output document for split operations.
+    -   Optional `parameters`:
+        -   `"delete_original": true` to delete the original documents after editing.
+        -   `"update_document": true` to add the edited PDF as a new version of the root document.
+        -   `"include_metadata": true` to copy metadata from the original document to the edited document.
+-   `remove_password`
+    -   Requires `parameters`:
+        -   `"password": "PASSWORD_STRING"` The password to remove from the PDF documents.
+    -   Optional `parameters`:
+        -   `"update_document": true` to add the password-less PDF as a new version of the root document.
+        -   `"delete_original": true` to delete the original document after editing.
+        -   `"include_metadata": true` to copy metadata from the original document to the new password-less document.
+-   `merge`
+    -   No additional `parameters` required.
+    -   The ordering of the merged document is determined by the list of IDs.
+    -   Optional `parameters`:
+        -   `"metadata_document_id": DOC_ID` apply metadata (tags, correspondent, etc.) from this document to the merged document.
+        -   `"delete_originals": true` to delete the original documents. This requires the calling user being the owner of
+            all documents that are merged.
+-   `split`
+    -   Requires `parameters`:
+        -   `"pages": [..]` The list should be a list of pages and/or a ranges, separated by commas e.g. `"[1,2-3,4,5-7]"`
+    -   Optional `parameters`:
+        -   `"delete_originals": true` to delete the original document after consumption. This requires the calling user being the owner of
+            the document.
+    -   The split operation only accepts a single document.
+-   `rotate`
+    -   Requires `parameters`:
+        -   `"degrees": DEGREES`. Must be an integer i.e. 90, 180, 270
+-   `delete_pages`
+    -   Requires `parameters`:
+        -   `"pages": [..]` The list should be a list of integers e.g. `"[2,3,4]"`
+    -   The delete_pages operation only accepts a single document.
 -   `modify_custom_fields`
    -   Requires `parameters`:
        -   `"add_custom_fields": { CUSTOM_FIELD_ID: VALUE }`: JSON object consisting of custom field id:value pairs to add to the document, can also be a list of custom field IDs
            to add with empty values.
        -   `"remove_custom_fields": [CUSTOM_FIELD_ID]`: custom field ids to remove from the document.

-#### Document-editing operations
-
-Beginning with version 10+, the API supports individual endpoints for document-editing operations (`merge`, `rotate`, `edit_pdf`, etc), thus their documentation can be found in the API spec / viewer. Legacy document-editing methods via `/api/documents/bulk_edit/` are still supported for compatibility, are deprecated and clients should migrate to the individual endpoints before they are removed in a future version.
-
 ### Objects

 Bulk editing for objects (tags, document types etc.) currently supports set permissions or delete
@@ -333,38 +369,41 @@ operations, using the endpoint: `/api/bulk_edit_objects/`, which requires a json

 ## API Versioning

-The REST API is versioned.
+The REST API is versioned since Paperless-ngx 1.3.0.

 -   Versioning ensures that changes to the API don't break older
    clients.
 -   Clients specify the specific version of the API they wish to use
    with every request and Paperless will handle the request using the
    specified API version.
-   Even if the underlying data model changes, supported older API
-    versions continue to serve compatible data.
-   If no version is specified, Paperless serves the configured default
-    API version (currently `10`).
-   Supported API versions are currently `9` and `10`.
+-   Even if the underlying data model changes, older API versions will
+    always serve compatible data.
+-   If no version is specified, Paperless will serve version 1 to ensure
+    compatibility with older clients that do not request a specific API
+    version.

 API versions are specified by submitting an additional HTTP `Accept`
 header with every request:

 ```
-Accept: application/json; version=10
+Accept: application/json; version=6
 ```

-If an invalid version is specified, Paperless responds with
-`406 Not Acceptable` and an error message in the body.
+If an invalid version is specified, Paperless 1.3.0 will respond with
+"406 Not Acceptable" and an error message in the body. Earlier
+versions of Paperless will serve API version 1 regardless of whether a
+version is specified via the `Accept` header.

 If a client wishes to verify whether it is compatible with any given
 server, the following procedure should be performed:

-1.  Perform an _authenticated_ request against any API endpoint. The
-    server will add two custom headers to the response:
+1.  Perform an _authenticated_ request against any API endpoint. If the
+    server is on version 1.3.0 or newer, the server will add two custom
+    headers to the response:

    ```
-    X-Api-Version: 10
-    X-Version: <server-version>
+    X-Api-Version: 2
+    X-Version: 1.3.0
    ```

 2.  Determine whether the client is compatible with this server based on
@@ -427,16 +466,3 @@ Initial API version.
 -   The document `created` field is now a date, not a datetime. The
    `created_date` field is considered deprecated and will be removed in a
    future version.
-
-#### Version 10
-
-   The `show_on_dashboard` and `show_in_sidebar` fields of saved views have been
-    removed. Relevant settings are now stored in the UISettings model. Compatibility is maintained
-    for versions < 10 until support for API v9 is dropped.
-   Document-editing operations such as `merge`, `rotate`, and `edit_pdf` have been
-    moved from the bulk edit endpoint to their own individual endpoints. Using these methods via
-    the bulk edit endpoint is still supported for compatibility with versions < 10 until support
-    for API v9 is dropped.
-   The `all` parameter of list endpoints is now deprecated and will be removed in a future version.
-   The bulk edit objects endpoint now supports `all` and `filters` parameters to avoid having to send
-    large lists of object IDs for operations affecting many objects.
--- a/docs/assets/logo_full_black.png
+++ b/docs/assets/logo_full_black.png
--- a/docs/assets/logo_full_white.png
+++ b/docs/assets/logo_full_white.png
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,23 +1,5 @@
 # Changelog

-## paperless-ngx 2.20.10
-
-### Bug Fixes
-
-   Fix: support string coercion in filepath jinja templates [@shamoon](https://github.com/shamoon) ([#12244](https://github.com/paperless-ngx/paperless-ngx/pull/12244))
-   Fix: apply ordering after annotating tag document count [@shamoon](https://github.com/shamoon) ([#12238](https://github.com/paperless-ngx/paperless-ngx/pull/12238))
-   Fix: enforce path limit for db filename fields [@shamoon](https://github.com/shamoon) ([#12235](https://github.com/paperless-ngx/paperless-ngx/pull/12235))
-
-### All App Changes
-
-<details>
-<summary>3 changes</summary>
-
-   Fix: support string coercion in filepath jinja templates [@shamoon](https://github.com/shamoon) ([#12244](https://github.com/paperless-ngx/paperless-ngx/pull/12244))
-   Fix: apply ordering after annotating tag document count [@shamoon](https://github.com/shamoon) ([#12238](https://github.com/paperless-ngx/paperless-ngx/pull/12238))
-   Fix: enforce path limit for db filename fields [@shamoon](https://github.com/shamoon) ([#12235](https://github.com/paperless-ngx/paperless-ngx/pull/12235))
-</details>
-
 ## paperless-ngx 2.20.9

 ### Security
--- a/docs/development.md
+++ b/docs/development.md
@@ -75,13 +75,13 @@ first-time setup.
 4.  Install the Python dependencies:

    ```bash
-    uv sync --group dev
+    $ uv sync --group dev
    ```

 5.  Install pre-commit hooks:

    ```bash
-    uv run prek install
+    $ uv run prek install
    ```

 6.  Apply migrations and create a superuser (also can be done via the web UI) for your development instance:
@@ -89,8 +89,8 @@ first-time setup.
    ```bash
    # src/

-    uv run manage.py migrate
-    uv run manage.py createsuperuser
+    $ uv run manage.py migrate
+    $ uv run manage.py createsuperuser
    ```

 7.  You can now either ...
@@ -103,7 +103,7 @@ first-time setup.

    -   spin up a bare Redis container

-        ```bash
+        ```
        docker run -d -p 6379:6379 --restart unless-stopped redis:latest
        ```

@@ -118,18 +118,18 @@ work well for development, but you can use whatever you want.
 Configure the IDE to use the `src/`-folder as the base source folder.
 Configure the following launch configurations in your IDE:

-   `uv run manage.py runserver`
-   `uv run manage.py document_consumer`
-   `uv run celery --app paperless worker -l DEBUG` (or any other log level)
+-   `python3 manage.py runserver`
+-   `python3 manage.py document_consumer`
+-   `celery --app paperless worker -l DEBUG` (or any other log level)

 To start them all:

 ```bash
 # src/

-uv run manage.py runserver & \
-  uv run manage.py document_consumer & \
-  uv run celery --app paperless worker -l DEBUG
+$ python3 manage.py runserver & \
+  python3 manage.py document_consumer & \
+  celery --app paperless worker -l DEBUG
 ```

 You might need the front end to test your back end code.
@@ -140,8 +140,8 @@ To build the front end once use this command:
 ```bash
 # src-ui/

-pnpm install
-pnpm ng build --configuration production
+$ pnpm install
+$ ng build --configuration production
 ```

 ### Testing
@@ -199,7 +199,7 @@ The front end is built using AngularJS. In order to get started, you need Node.j
 4.  You can launch a development server by running:

    ```bash
-    pnpm ng serve
+    ng serve
    ```

    This will automatically update whenever you save. However, in-place
@@ -217,21 +217,21 @@ commit. See [above](#code-formatting-with-pre-commit-hooks) for installation ins
 command such as

 ```bash
-git ls-files -- '*.ts' | xargs uv run prek run prettier --files
+$ git ls-files -- '*.ts' | xargs prek run prettier --files
 ```

 Front end testing uses Jest and Playwright. Unit tests and e2e tests,
 respectively, can be run non-interactively with:

 ```bash
-pnpm ng test
-pnpm playwright test
+$ ng test
+$ npx playwright test
 ```

 Playwright also includes a UI which can be run with:

 ```bash
-pnpm playwright test --ui
+$ npx playwright test --ui
 ```

 ### Building the frontend
@@ -239,7 +239,7 @@ pnpm playwright test --ui
 In order to build the front end and serve it as part of Django, execute:

 ```bash
-pnpm ng build --configuration production
+$ ng build --configuration production
 ```

 This will build the front end and put it in a location from which the
@@ -312,10 +312,10 @@ end (such as error messages).
 -   The source language of the project is "en_US".
 -   Localization files end up in the folder `src/locale/`.
 -   In order to extract strings from the application, call
-    `uv run manage.py makemessages -l en_US`. This is important after
+    `python3 manage.py makemessages -l en_US`. This is important after
    making changes to translatable strings.
 -   The message files need to be compiled for them to show up in the
-    application. Call `uv run manage.py compilemessages` to do this.
+    application. Call `python3 manage.py compilemessages` to do this.
    The generated files don't get committed into git, since these are
    derived artifacts. The build pipeline takes care of executing this
    command.
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -172,7 +172,7 @@ to enable polling and disable inotify. See [here](configuration.md#polling).
 #### Prerequisites

 -   Paperless runs on Linux only, Windows is not supported.
-   Python 3.11, 3.12, 3.13, or 3.14 is required. As a policy, Paperless-ngx aims to support at least the three most recent Python versions and drops support for versions as they reach end-of-life. Newer versions may work, but some dependencies may not be fully compatible.
+-   Python 3 is required with versions 3.10 - 3.12 currently supported. Newer versions may work, but some dependencies may not be fully compatible.

 #### Installation

--- a/docs/usage.md
+++ b/docs/usage.md
@@ -95,7 +95,6 @@ Think of versions as **file history** for a document.

 -   Versions track the underlying file and extracted text content (OCR/text).
 -   Metadata such as tags, correspondent, document type, storage path and custom fields stay on the "root" document.
-   Version files follow normal filename formatting (including storage paths) and add a `_vN` suffix (for example `_v1`, `_v2`).
 -   By default, search and document content use the latest version.
 -   In document detail, selecting a version switches the preview, file metadata and content (and download etc buttons) to that version.
 -   Deleting a non-root version keeps metadata and falls back to the latest remaining version.
@@ -617,7 +616,7 @@ applied. You can use the following placeholders in the template with any trigger
 -   `{{added_day}}`: added day
 -   `{{added_time}}`: added time in HH:MM format
 -   `{{original_filename}}`: original file name without extension
-   `{{filename}}`: current file name without extension (for "added" workflows this may not be final yet, you can use `{{original_filename}}`)
+-   `{{filename}}`: current file name without extension
 -   `{{doc_title}}`: current document title (cannot be used in title assignment)

 The following placeholders are only available for "added" or "updated" triggers
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,11 +1,12 @@
 [project]
 name = "paperless-ngx"
-version = "2.20.10"
+version = "2.20.9"
 description = "A community-supported supercharged document management system: scan, index and archive all your physical documents"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.10"
 classifiers = [
  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.10",
  "Programming Language :: Python :: 3.11",
  "Programming Language :: Python :: 3.12",
  "Programming Language :: Python :: 3.13",
@@ -45,11 +46,10 @@ dependencies = [
  "drf-spectacular-sidecar~=2026.1.1",
  "drf-writable-nested~=0.7.1",
  "faiss-cpu>=1.10",
-  "filelock~=3.20.3",
+  "filelock~=3.24.3",
  "flower~=2.0.1",
  "gotenberg-client~=0.13.1",
  "httpx-oauth~=0.16",
-  "ijson>=3.2",
  "imap-tools~=1.11.0",
  "jinja2~=3.1.5",
  "langdetect~=1.0.9",
@@ -111,7 +111,6 @@ docs = [
 testing = [
  "daphne",
  "factory-boy~=3.3.1",
-  "faker~=40.5.1",
  "imagehash",
  "pytest~=9.0.0",
  "pytest-cov~=7.0.0",
@@ -177,7 +176,7 @@ torch = [
 ]

 [tool.ruff]
-target-version = "py311"
+target-version = "py310"
 line-length = 88
 src = [
  "src",
@@ -310,7 +309,6 @@ markers = [
 [tool.pytest_env]
 PAPERLESS_DISABLE_DBHANDLER = "true"
 PAPERLESS_CACHE_BACKEND = "django.core.cache.backends.locmem.LocMemCache"
-PAPERLESS_CHANNELS_BACKEND = "channels.layers.InMemoryChannelLayer"

 [tool.coverage.report]
 exclude_also = [
--- a/scripts/post-consumption-example.sh
+++ b/scripts/post-consumption-example.sh
@@ -19,4 +19,6 @@ following additional information about it:
 * Correspondent: ${DOCUMENT_CORRESPONDENT}
 * Tags: ${DOCUMENT_TAGS}

+It was consumed with the passphrase ${PASSPHRASE}
+
 "
--- a/src-ui/.eslintrc.json
+++ b/src-ui/.eslintrc.json
@@ -0,0 +1,51 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*",
+    "/src/app/components/common/pdf-viewer/**"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "pngx",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "pngx",
+            "style": "kebab-case"
+          }
+        ]
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}
--- a/src-ui/e2e/dashboard/requests/api-dashboard1.har
+++ b/src-ui/e2e/dashboard/requests/api-dashboard1.har
@@ -58,7 +58,7 @@
          "content": {
            "size": -1,
            "mimeType": "application/json",
-            "text": "{\"user\":{\"id\":2,\"username\":\"testuser\",\"is_superuser\":false,\"groups\":[]},\"settings\":{\"language\":\"\",\"bulk_edit\":{\"confirmation_dialogs\":true,\"apply_on_close\":false},\"documentListSize\":50,\"dark_mode\":{\"use_system\":false,\"enabled\":\"false\",\"thumb_inverted\":\"true\"},\"theme\":{\"color\":\"#9fbf2f\"},\"document_details\":{\"native_pdf_viewer\":false},\"date_display\":{\"date_locale\":\"\",\"date_format\":\"mediumDate\"},\"notifications\":{\"consumer_new_documents\":true,\"consumer_success\":true,\"consumer_failed\":true,\"consumer_suppress_on_dashboard\":true},\"comments_enabled\":true,\"slim_sidebar\":false,\"update_checking\":{\"enabled\":false,\"backend_setting\":\"default\"},\"saved_views\":{\"warn_on_unsaved_change\":true,\"dashboard_views_visible_ids\":[7,4],\"sidebar_views_visible_ids\":[7,4,11]},\"notes_enabled\":true,\"tour_complete\":true},\"permissions\":[\"delete_schedule\",\"view_note\",\"view_taskattributes\",\"delete_ormq\",\"add_ormq\",\"change_tag\",\"change_chordcounter\",\"delete_savedviewfilterrule\",\"delete_comment\",\"add_session\",\"add_mailrule\",\"add_tokenproxy\",\"delete_taskresult\",\"view_failure\",\"add_tag\",\"view_savedviewfilterrule\",\"view_paperlesstask\",\"change_mailaccount\",\"change_frontendsettings\",\"delete_group\",\"add_userobjectpermission\",\"add_failure\",\"delete_mailrule\",\"view_userobjectpermission\",\"change_schedule\",\"delete_note\",\"view_ormq\",\"add_note\",\"add_chordcounter\",\"delete_token\",\"change_failure\",\"add_savedviewfilterrule\",\"delete_user\",\"view_correspondent\",\"view_schedule\",\"change_tokenproxy\",\"view_user\",\"delete_task\",\"delete_correspondent\",\"delete_chordcounter\",\"delete_document\",\"view_taskresult\",\"change_document\",\"add_frontendsettings\",\"view_mailrule\",\"change_ormq\",\"delete_taskattributes\",\"view_logentry\",\"view_mailaccount\",\"view_log\",\"delete_success\",\"view_frontendsettings\",\"view_documenttype\",\"change_taskresult\",\"view_permission\",\"add_groupobjectpermission\",\"change_user\",\"view_document\",\"change_userobjectpermission\",\"add_user\",\"add_correspondent\",\"add_token\",\"add_mailaccount\",\"change_group\",\"add_group\",\"delete_processedmail\",\"delete_contenttype\",\"add_savedview\",\"view_chordcounter\",\"delete_tokenproxy\",\"change_groupresult\",\"delete_session\",\"view_savedview\",\"view_processedmail\",\"add_comment\",\"view_storagepath\",\"delete_documenttype\",\"add_processedmail\",\"view_group\",\"change_processedmail\",\"view_session\",\"delete_storagepath\",\"delete_paperlesstask\",\"add_groupresult\",\"delete_savedview\",\"delete_userobjectpermission\",\"view_tokenproxy\",\"add_task\",\"view_tag\",\"add_taskresult\",\"change_documenttype\",\"change_mailrule\",\"add_document\",\"change_comment\",\"view_task\",\"view_groupresult\",\"change_contenttype\",\"view_groupobjectpermission\",\"change_task\",\"add_log\",\"add_success\",\"change_savedview\",\"delete_frontendsettings\",\"view_success\",\"add_permission\",\"change_correspondent\",\"add_paperlesstask\",\"change_paperlesstask\",\"add_contenttype\",\"view_comment\",\"change_logentry\",\"delete_logentry\",\"delete_mailaccount\",\"change_session\",\"delete_groupresult\",\"add_logentry\",\"change_savedviewfilterrule\",\"change_success\",\"delete_tag\",\"add_taskattributes\",\"change_groupobjectpermission\",\"delete_failure\",\"add_uisettings\",\"view_token\",\"add_schedule\",\"delete_log\",\"delete_uisettings\",\"change_permission\",\"delete_groupobjectpermission\",\"change_token\",\"view_uisettings\",\"change_uisettings\",\"delete_permission\",\"add_storagepath\",\"change_storagepath\",\"view_contenttype\",\"change_note\",\"change_log\",\"change_taskattributes\",\"add_documenttype\"]}"
+            "text": "{\"user\":{\"id\":2,\"username\":\"testuser\",\"is_superuser\":false,\"groups\":[]},\"settings\":{\"language\":\"\",\"bulk_edit\":{\"confirmation_dialogs\":true,\"apply_on_close\":false},\"documentListSize\":50,\"dark_mode\":{\"use_system\":false,\"enabled\":\"false\",\"thumb_inverted\":\"true\"},\"theme\":{\"color\":\"#9fbf2f\"},\"document_details\":{\"native_pdf_viewer\":false},\"date_display\":{\"date_locale\":\"\",\"date_format\":\"mediumDate\"},\"notifications\":{\"consumer_new_documents\":true,\"consumer_success\":true,\"consumer_failed\":true,\"consumer_suppress_on_dashboard\":true},\"comments_enabled\":true,\"slim_sidebar\":false,\"update_checking\":{\"enabled\":false,\"backend_setting\":\"default\"},\"saved_views\":{\"warn_on_unsaved_change\":true},\"notes_enabled\":true,\"tour_complete\":true},\"permissions\":[\"delete_schedule\",\"view_note\",\"view_taskattributes\",\"delete_ormq\",\"add_ormq\",\"change_tag\",\"change_chordcounter\",\"delete_savedviewfilterrule\",\"delete_comment\",\"add_session\",\"add_mailrule\",\"add_tokenproxy\",\"delete_taskresult\",\"view_failure\",\"add_tag\",\"view_savedviewfilterrule\",\"view_paperlesstask\",\"change_mailaccount\",\"change_frontendsettings\",\"delete_group\",\"add_userobjectpermission\",\"add_failure\",\"delete_mailrule\",\"view_userobjectpermission\",\"change_schedule\",\"delete_note\",\"view_ormq\",\"add_note\",\"add_chordcounter\",\"delete_token\",\"change_failure\",\"add_savedviewfilterrule\",\"delete_user\",\"view_correspondent\",\"view_schedule\",\"change_tokenproxy\",\"view_user\",\"delete_task\",\"delete_correspondent\",\"delete_chordcounter\",\"delete_document\",\"view_taskresult\",\"change_document\",\"add_frontendsettings\",\"view_mailrule\",\"change_ormq\",\"delete_taskattributes\",\"view_logentry\",\"view_mailaccount\",\"view_log\",\"delete_success\",\"view_frontendsettings\",\"view_documenttype\",\"change_taskresult\",\"view_permission\",\"add_groupobjectpermission\",\"change_user\",\"view_document\",\"change_userobjectpermission\",\"add_user\",\"add_correspondent\",\"add_token\",\"add_mailaccount\",\"change_group\",\"add_group\",\"delete_processedmail\",\"delete_contenttype\",\"add_savedview\",\"view_chordcounter\",\"delete_tokenproxy\",\"change_groupresult\",\"delete_session\",\"view_savedview\",\"view_processedmail\",\"add_comment\",\"view_storagepath\",\"delete_documenttype\",\"add_processedmail\",\"view_group\",\"change_processedmail\",\"view_session\",\"delete_storagepath\",\"delete_paperlesstask\",\"add_groupresult\",\"delete_savedview\",\"delete_userobjectpermission\",\"view_tokenproxy\",\"add_task\",\"view_tag\",\"add_taskresult\",\"change_documenttype\",\"change_mailrule\",\"add_document\",\"change_comment\",\"view_task\",\"view_groupresult\",\"change_contenttype\",\"view_groupobjectpermission\",\"change_task\",\"add_log\",\"add_success\",\"change_savedview\",\"delete_frontendsettings\",\"view_success\",\"add_permission\",\"change_correspondent\",\"add_paperlesstask\",\"change_paperlesstask\",\"add_contenttype\",\"view_comment\",\"change_logentry\",\"delete_logentry\",\"delete_mailaccount\",\"change_session\",\"delete_groupresult\",\"add_logentry\",\"change_savedviewfilterrule\",\"change_success\",\"delete_tag\",\"add_taskattributes\",\"change_groupobjectpermission\",\"delete_failure\",\"add_uisettings\",\"view_token\",\"add_schedule\",\"delete_log\",\"delete_uisettings\",\"change_permission\",\"delete_groupobjectpermission\",\"change_token\",\"view_uisettings\",\"change_uisettings\",\"delete_permission\",\"add_storagepath\",\"change_storagepath\",\"view_contenttype\",\"change_note\",\"change_log\",\"change_taskattributes\",\"add_documenttype\"]}"
          },
          "headersSize": -1,
          "bodySize": -1,
@@ -468,7 +468,7 @@
        "time": 0.951,
        "request": {
          "method": "GET",
-          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__in=9",
+          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&tags__id__in=9",
          "httpVersion": "HTTP/1.1",
          "cookies": [],
          "headers": [
--- a/src-ui/e2e/dashboard/requests/api-dashboard2.har
+++ b/src-ui/e2e/dashboard/requests/api-dashboard2.har
--- a/src-ui/e2e/dashboard/requests/api-dashboard3.har
+++ b/src-ui/e2e/dashboard/requests/api-dashboard3.har
@@ -58,7 +58,7 @@
          "content": {
            "size": -1,
            "mimeType": "application/json",
-            "text": "{\"user\":{\"id\":2,\"username\":\"testuser\",\"is_superuser\":false,\"groups\":[]},\"settings\":{\"language\":\"\",\"bulk_edit\":{\"confirmation_dialogs\":true,\"apply_on_close\":false},\"documentListSize\":50,\"dark_mode\":{\"use_system\":false,\"enabled\":\"false\",\"thumb_inverted\":\"true\"},\"theme\":{\"color\":\"#9fbf2f\"},\"document_details\":{\"native_pdf_viewer\":false},\"date_display\":{\"date_locale\":\"\",\"date_format\":\"mediumDate\"},\"notifications\":{\"consumer_new_documents\":true,\"consumer_success\":true,\"consumer_failed\":true,\"consumer_suppress_on_dashboard\":true},\"comments_enabled\":true,\"slim_sidebar\":false,\"update_checking\":{\"enabled\":false,\"backend_setting\":\"default\"},\"saved_views\":{\"warn_on_unsaved_change\":true,\"dashboard_views_visible_ids\":[7,4],\"sidebar_views_visible_ids\":[7,4,11]},\"notes_enabled\":true,\"tour_complete\":true},\"permissions\":[\"delete_schedule\",\"view_note\",\"view_taskattributes\",\"delete_ormq\",\"add_ormq\",\"change_tag\",\"change_chordcounter\",\"delete_savedviewfilterrule\",\"delete_comment\",\"add_session\",\"add_mailrule\",\"add_tokenproxy\",\"delete_taskresult\",\"view_failure\",\"add_tag\",\"view_savedviewfilterrule\",\"view_paperlesstask\",\"change_mailaccount\",\"change_frontendsettings\",\"delete_group\",\"add_userobjectpermission\",\"add_failure\",\"delete_mailrule\",\"view_userobjectpermission\",\"change_schedule\",\"delete_note\",\"view_ormq\",\"add_note\",\"add_chordcounter\",\"delete_token\",\"change_failure\",\"add_savedviewfilterrule\",\"delete_user\",\"view_correspondent\",\"view_schedule\",\"change_tokenproxy\",\"view_user\",\"delete_task\",\"delete_correspondent\",\"delete_chordcounter\",\"delete_document\",\"view_taskresult\",\"change_document\",\"add_frontendsettings\",\"view_mailrule\",\"change_ormq\",\"delete_taskattributes\",\"view_logentry\",\"view_mailaccount\",\"view_log\",\"delete_success\",\"view_frontendsettings\",\"view_documenttype\",\"change_taskresult\",\"view_permission\",\"add_groupobjectpermission\",\"change_user\",\"view_document\",\"change_userobjectpermission\",\"add_user\",\"add_correspondent\",\"add_token\",\"add_mailaccount\",\"change_group\",\"add_group\",\"delete_processedmail\",\"delete_contenttype\",\"add_savedview\",\"view_chordcounter\",\"delete_tokenproxy\",\"change_groupresult\",\"delete_session\",\"view_savedview\",\"view_processedmail\",\"add_comment\",\"view_storagepath\",\"delete_documenttype\",\"add_processedmail\",\"view_group\",\"change_processedmail\",\"view_session\",\"delete_storagepath\",\"delete_paperlesstask\",\"add_groupresult\",\"delete_savedview\",\"delete_userobjectpermission\",\"view_tokenproxy\",\"add_task\",\"view_tag\",\"add_taskresult\",\"change_documenttype\",\"change_mailrule\",\"add_document\",\"change_comment\",\"view_task\",\"view_groupresult\",\"change_contenttype\",\"view_groupobjectpermission\",\"change_task\",\"add_log\",\"add_success\",\"change_savedview\",\"delete_frontendsettings\",\"view_success\",\"add_permission\",\"change_correspondent\",\"add_paperlesstask\",\"change_paperlesstask\",\"add_contenttype\",\"view_comment\",\"change_logentry\",\"delete_logentry\",\"delete_mailaccount\",\"change_session\",\"delete_groupresult\",\"add_logentry\",\"change_savedviewfilterrule\",\"change_success\",\"delete_tag\",\"add_taskattributes\",\"change_groupobjectpermission\",\"delete_failure\",\"add_uisettings\",\"view_token\",\"add_schedule\",\"delete_log\",\"delete_uisettings\",\"change_permission\",\"delete_groupobjectpermission\",\"change_token\",\"view_uisettings\",\"change_uisettings\",\"delete_permission\",\"add_storagepath\",\"change_storagepath\",\"view_contenttype\",\"change_note\",\"change_log\",\"change_taskattributes\",\"add_documenttype\"]}"
+            "text": "{\"user\":{\"id\":2,\"username\":\"testuser\",\"is_superuser\":false,\"groups\":[]},\"settings\":{\"language\":\"\",\"bulk_edit\":{\"confirmation_dialogs\":true,\"apply_on_close\":false},\"documentListSize\":50,\"dark_mode\":{\"use_system\":false,\"enabled\":\"false\",\"thumb_inverted\":\"true\"},\"theme\":{\"color\":\"#9fbf2f\"},\"document_details\":{\"native_pdf_viewer\":false},\"date_display\":{\"date_locale\":\"\",\"date_format\":\"mediumDate\"},\"notifications\":{\"consumer_new_documents\":true,\"consumer_success\":true,\"consumer_failed\":true,\"consumer_suppress_on_dashboard\":true},\"comments_enabled\":true,\"slim_sidebar\":false,\"update_checking\":{\"enabled\":false,\"backend_setting\":\"default\"},\"saved_views\":{\"warn_on_unsaved_change\":true},\"notes_enabled\":true,\"tour_complete\":true},\"permissions\":[\"delete_schedule\",\"view_note\",\"view_taskattributes\",\"delete_ormq\",\"add_ormq\",\"change_tag\",\"change_chordcounter\",\"delete_savedviewfilterrule\",\"delete_comment\",\"add_session\",\"add_mailrule\",\"add_tokenproxy\",\"delete_taskresult\",\"view_failure\",\"add_tag\",\"view_savedviewfilterrule\",\"view_paperlesstask\",\"change_mailaccount\",\"change_frontendsettings\",\"delete_group\",\"add_userobjectpermission\",\"add_failure\",\"delete_mailrule\",\"view_userobjectpermission\",\"change_schedule\",\"delete_note\",\"view_ormq\",\"add_note\",\"add_chordcounter\",\"delete_token\",\"change_failure\",\"add_savedviewfilterrule\",\"delete_user\",\"view_correspondent\",\"view_schedule\",\"change_tokenproxy\",\"view_user\",\"delete_task\",\"delete_correspondent\",\"delete_chordcounter\",\"delete_document\",\"view_taskresult\",\"change_document\",\"add_frontendsettings\",\"view_mailrule\",\"change_ormq\",\"delete_taskattributes\",\"view_logentry\",\"view_mailaccount\",\"view_log\",\"delete_success\",\"view_frontendsettings\",\"view_documenttype\",\"change_taskresult\",\"view_permission\",\"add_groupobjectpermission\",\"change_user\",\"view_document\",\"change_userobjectpermission\",\"add_user\",\"add_correspondent\",\"add_token\",\"add_mailaccount\",\"change_group\",\"add_group\",\"delete_processedmail\",\"delete_contenttype\",\"add_savedview\",\"view_chordcounter\",\"delete_tokenproxy\",\"change_groupresult\",\"delete_session\",\"view_savedview\",\"view_processedmail\",\"add_comment\",\"view_storagepath\",\"delete_documenttype\",\"add_processedmail\",\"view_group\",\"change_processedmail\",\"view_session\",\"delete_storagepath\",\"delete_paperlesstask\",\"add_groupresult\",\"delete_savedview\",\"delete_userobjectpermission\",\"view_tokenproxy\",\"add_task\",\"view_tag\",\"add_taskresult\",\"change_documenttype\",\"change_mailrule\",\"add_document\",\"change_comment\",\"view_task\",\"view_groupresult\",\"change_contenttype\",\"view_groupobjectpermission\",\"change_task\",\"add_log\",\"add_success\",\"change_savedview\",\"delete_frontendsettings\",\"view_success\",\"add_permission\",\"change_correspondent\",\"add_paperlesstask\",\"change_paperlesstask\",\"add_contenttype\",\"view_comment\",\"change_logentry\",\"delete_logentry\",\"delete_mailaccount\",\"change_session\",\"delete_groupresult\",\"add_logentry\",\"change_savedviewfilterrule\",\"change_success\",\"delete_tag\",\"add_taskattributes\",\"change_groupobjectpermission\",\"delete_failure\",\"add_uisettings\",\"view_token\",\"add_schedule\",\"delete_log\",\"delete_uisettings\",\"change_permission\",\"delete_groupobjectpermission\",\"change_token\",\"view_uisettings\",\"change_uisettings\",\"delete_permission\",\"add_storagepath\",\"change_storagepath\",\"view_contenttype\",\"change_note\",\"change_log\",\"change_taskattributes\",\"add_documenttype\"]}"
          },
          "headersSize": -1,
          "bodySize": -1,
@@ -534,7 +534,7 @@
        "time": 0.653,
        "request": {
          "method": "GET",
-          "url": "http://localhost:8000/api/documents/?page=1&page_size=10&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=9",
+          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&tags__id__all=9",
          "httpVersion": "HTTP/1.1",
          "cookies": [],
          "headers": [
--- a/src-ui/e2e/dashboard/requests/api-dashboard4.har
+++ b/src-ui/e2e/dashboard/requests/api-dashboard4.har
@@ -58,7 +58,7 @@
          "content": {
            "size": -1,
            "mimeType": "application/json",
-            "text": "{\"user\":{\"id\":2,\"username\":\"testuser\",\"is_superuser\":false,\"groups\":[]},\"settings\":{\"language\":\"\",\"bulk_edit\":{\"confirmation_dialogs\":true,\"apply_on_close\":false},\"documentListSize\":50,\"dark_mode\":{\"use_system\":false,\"enabled\":\"false\",\"thumb_inverted\":\"true\"},\"theme\":{\"color\":\"#9fbf2f\"},\"document_details\":{\"native_pdf_viewer\":false},\"date_display\":{\"date_locale\":\"\",\"date_format\":\"mediumDate\"},\"notifications\":{\"consumer_new_documents\":true,\"consumer_success\":true,\"consumer_failed\":true,\"consumer_suppress_on_dashboard\":true},\"comments_enabled\":true,\"slim_sidebar\":false,\"update_checking\":{\"enabled\":false,\"backend_setting\":\"default\"},\"saved_views\":{\"warn_on_unsaved_change\":true,\"dashboard_views_visible_ids\":[7,4],\"sidebar_views_visible_ids\":[7,4,11]},\"notes_enabled\":true,\"tour_complete\":true},\"permissions\":[\"delete_schedule\",\"view_note\",\"view_taskattributes\",\"delete_ormq\",\"add_ormq\",\"change_tag\",\"change_chordcounter\",\"delete_savedviewfilterrule\",\"delete_comment\",\"add_session\",\"add_mailrule\",\"add_tokenproxy\",\"delete_taskresult\",\"view_failure\",\"add_tag\",\"view_savedviewfilterrule\",\"view_paperlesstask\",\"change_mailaccount\",\"change_frontendsettings\",\"delete_group\",\"add_userobjectpermission\",\"add_failure\",\"delete_mailrule\",\"view_userobjectpermission\",\"change_schedule\",\"delete_note\",\"view_ormq\",\"add_note\",\"add_chordcounter\",\"delete_token\",\"change_failure\",\"add_savedviewfilterrule\",\"delete_user\",\"view_correspondent\",\"view_schedule\",\"change_tokenproxy\",\"view_user\",\"delete_task\",\"delete_correspondent\",\"delete_chordcounter\",\"delete_document\",\"view_taskresult\",\"change_document\",\"add_frontendsettings\",\"view_mailrule\",\"change_ormq\",\"delete_taskattributes\",\"view_logentry\",\"view_mailaccount\",\"view_log\",\"delete_success\",\"view_frontendsettings\",\"view_documenttype\",\"change_taskresult\",\"view_permission\",\"add_groupobjectpermission\",\"change_user\",\"view_document\",\"change_userobjectpermission\",\"add_user\",\"add_correspondent\",\"add_token\",\"add_mailaccount\",\"change_group\",\"add_group\",\"delete_processedmail\",\"delete_contenttype\",\"add_savedview\",\"view_chordcounter\",\"delete_tokenproxy\",\"change_groupresult\",\"delete_session\",\"view_savedview\",\"view_processedmail\",\"add_comment\",\"view_storagepath\",\"delete_documenttype\",\"add_processedmail\",\"view_group\",\"change_processedmail\",\"view_session\",\"delete_storagepath\",\"delete_paperlesstask\",\"add_groupresult\",\"delete_savedview\",\"delete_userobjectpermission\",\"view_tokenproxy\",\"add_task\",\"view_tag\",\"add_taskresult\",\"change_documenttype\",\"change_mailrule\",\"add_document\",\"change_comment\",\"view_task\",\"view_groupresult\",\"change_contenttype\",\"view_groupobjectpermission\",\"change_task\",\"add_log\",\"add_success\",\"change_savedview\",\"delete_frontendsettings\",\"view_success\",\"add_permission\",\"change_correspondent\",\"add_paperlesstask\",\"change_paperlesstask\",\"add_contenttype\",\"view_comment\",\"change_logentry\",\"delete_logentry\",\"delete_mailaccount\",\"change_session\",\"delete_groupresult\",\"add_logentry\",\"change_savedviewfilterrule\",\"change_success\",\"delete_tag\",\"add_taskattributes\",\"change_groupobjectpermission\",\"delete_failure\",\"add_uisettings\",\"view_token\",\"add_schedule\",\"delete_log\",\"delete_uisettings\",\"change_permission\",\"delete_groupobjectpermission\",\"change_token\",\"view_uisettings\",\"change_uisettings\",\"delete_permission\",\"add_storagepath\",\"change_storagepath\",\"view_contenttype\",\"change_note\",\"change_log\",\"change_taskattributes\",\"add_documenttype\"]}"
+            "text": "{\"user\":{\"id\":2,\"username\":\"testuser\",\"is_superuser\":false,\"groups\":[]},\"settings\":{\"language\":\"\",\"bulk_edit\":{\"confirmation_dialogs\":true,\"apply_on_close\":false},\"documentListSize\":50,\"dark_mode\":{\"use_system\":false,\"enabled\":\"false\",\"thumb_inverted\":\"true\"},\"theme\":{\"color\":\"#9fbf2f\"},\"document_details\":{\"native_pdf_viewer\":false},\"date_display\":{\"date_locale\":\"\",\"date_format\":\"mediumDate\"},\"notifications\":{\"consumer_new_documents\":true,\"consumer_success\":true,\"consumer_failed\":true,\"consumer_suppress_on_dashboard\":true},\"comments_enabled\":true,\"slim_sidebar\":false,\"update_checking\":{\"enabled\":false,\"backend_setting\":\"default\"},\"saved_views\":{\"warn_on_unsaved_change\":true},\"notes_enabled\":true,\"tour_complete\":true},\"permissions\":[\"delete_schedule\",\"view_note\",\"view_taskattributes\",\"delete_ormq\",\"add_ormq\",\"change_tag\",\"change_chordcounter\",\"delete_savedviewfilterrule\",\"delete_comment\",\"add_session\",\"add_mailrule\",\"add_tokenproxy\",\"delete_taskresult\",\"view_failure\",\"add_tag\",\"view_savedviewfilterrule\",\"view_paperlesstask\",\"change_mailaccount\",\"change_frontendsettings\",\"delete_group\",\"add_userobjectpermission\",\"add_failure\",\"delete_mailrule\",\"view_userobjectpermission\",\"change_schedule\",\"delete_note\",\"view_ormq\",\"add_note\",\"add_chordcounter\",\"delete_token\",\"change_failure\",\"add_savedviewfilterrule\",\"delete_user\",\"view_correspondent\",\"view_schedule\",\"change_tokenproxy\",\"view_user\",\"delete_task\",\"delete_correspondent\",\"delete_chordcounter\",\"delete_document\",\"view_taskresult\",\"change_document\",\"add_frontendsettings\",\"view_mailrule\",\"change_ormq\",\"delete_taskattributes\",\"view_logentry\",\"view_mailaccount\",\"view_log\",\"delete_success\",\"view_frontendsettings\",\"view_documenttype\",\"change_taskresult\",\"view_permission\",\"add_groupobjectpermission\",\"change_user\",\"view_document\",\"change_userobjectpermission\",\"add_user\",\"add_correspondent\",\"add_token\",\"add_mailaccount\",\"change_group\",\"add_group\",\"delete_processedmail\",\"delete_contenttype\",\"add_savedview\",\"view_chordcounter\",\"delete_tokenproxy\",\"change_groupresult\",\"delete_session\",\"view_savedview\",\"view_processedmail\",\"add_comment\",\"view_storagepath\",\"delete_documenttype\",\"add_processedmail\",\"view_group\",\"change_processedmail\",\"view_session\",\"delete_storagepath\",\"delete_paperlesstask\",\"add_groupresult\",\"delete_savedview\",\"delete_userobjectpermission\",\"view_tokenproxy\",\"add_task\",\"view_tag\",\"add_taskresult\",\"change_documenttype\",\"change_mailrule\",\"add_document\",\"change_comment\",\"view_task\",\"view_groupresult\",\"change_contenttype\",\"view_groupobjectpermission\",\"change_task\",\"add_log\",\"add_success\",\"change_savedview\",\"delete_frontendsettings\",\"view_success\",\"add_permission\",\"change_correspondent\",\"add_paperlesstask\",\"change_paperlesstask\",\"add_contenttype\",\"view_comment\",\"change_logentry\",\"delete_logentry\",\"delete_mailaccount\",\"change_session\",\"delete_groupresult\",\"add_logentry\",\"change_savedviewfilterrule\",\"change_success\",\"delete_tag\",\"add_taskattributes\",\"change_groupobjectpermission\",\"delete_failure\",\"add_uisettings\",\"view_token\",\"add_schedule\",\"delete_log\",\"delete_uisettings\",\"change_permission\",\"delete_groupobjectpermission\",\"change_token\",\"view_uisettings\",\"change_uisettings\",\"delete_permission\",\"add_storagepath\",\"change_storagepath\",\"view_contenttype\",\"change_note\",\"change_log\",\"change_taskattributes\",\"add_documenttype\"]}"
          },
          "headersSize": -1,
          "bodySize": -1,
--- a/src-ui/e2e/document-detail/requests/api-document-detail2.har
+++ b/src-ui/e2e/document-detail/requests/api-document-detail2.har
@@ -883,7 +883,7 @@
        "time": 0.93,
        "request": {
          "method": "GET",
-          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=4",
+          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&tags__id__all=4",
          "httpVersion": "HTTP/1.1",
          "cookies": [],
          "headers": [
@@ -961,7 +961,7 @@
        "time": -1,
        "request": {
          "method": "GET",
-          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=4",
+          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&tags__id__all=4",
          "httpVersion": "HTTP/1.1",
          "cookies": [],
          "headers": [
--- a/src-ui/e2e/document-list/document-list.spec.ts
+++ b/src-ui/e2e/document-list/document-list.spec.ts
@@ -16,7 +16,7 @@ test('basic filtering', async ({ page }) => {
  await expect(page).toHaveURL(/tags__id__all=9/)
  await expect(page.locator('pngx-document-list')).toHaveText(/8 documents/)
  await page.getByRole('button', { name: 'Document type' }).click()
-  await page.getByRole('menuitem', { name: /^Invoice Test/ }).click()
+  await page.getByRole('menuitem', { name: 'Invoice Test 3' }).click()
  await expect(page).toHaveURL(/document_type__id__in=1/)
  await expect(page.locator('pngx-document-list')).toHaveText(/3 documents/)
  await page.getByRole('button', { name: 'Reset filters' }).first().click()
--- a/src-ui/e2e/document-list/requests/api-document-list1.har
+++ b/src-ui/e2e/document-list/requests/api-document-list1.har
--- a/src-ui/e2e/document-list/requests/api-document-list2.har
+++ b/src-ui/e2e/document-list/requests/api-document-list2.har
--- a/src-ui/e2e/document-list/requests/api-document-list3.har
+++ b/src-ui/e2e/document-list/requests/api-document-list3.har
--- a/src-ui/e2e/document-list/requests/api-document-list4.har
+++ b/src-ui/e2e/document-list/requests/api-document-list4.har
--- a/src-ui/e2e/document-list/requests/api-document-list5.har
+++ b/src-ui/e2e/document-list/requests/api-document-list5.har
--- a/src-ui/e2e/document-list/requests/api-document-list6.har
+++ b/src-ui/e2e/document-list/requests/api-document-list6.har
--- a/src-ui/eslint.config.js
+++ b/src-ui/eslint.config.js
@@ -1,58 +0,0 @@
-const angularEslintPlugin = require('@angular-eslint/eslint-plugin')
-const angularTemplatePlugin = require('@angular-eslint/eslint-plugin-template')
-const angularTemplateParser = require('@angular-eslint/template-parser')
-const tsParser = require('@typescript-eslint/parser')
-
-module.exports = [
-  {
-    ignores: ['projects/**/*', 'src/app/components/common/pdf-viewer/**'],
-  },
-  {
-    files: ['**/*.ts'],
-    languageOptions: {
-      parser: tsParser,
-      parserOptions: {
-        project: ['tsconfig.json'],
-        createDefaultProgram: true,
-        ecmaVersion: 2020,
-        sourceType: 'module',
-      },
-    },
-    plugins: {
-      '@angular-eslint': angularEslintPlugin,
-      '@angular-eslint/template': angularTemplatePlugin,
-    },
-    processor: '@angular-eslint/template/extract-inline-html',
-    rules: {
-      ...angularEslintPlugin.configs.recommended.rules,
-      '@angular-eslint/directive-selector': [
-        'error',
-        {
-          type: 'attribute',
-          prefix: 'pngx',
-          style: 'camelCase',
-        },
-      ],
-      '@angular-eslint/component-selector': [
-        'error',
-        {
-          type: 'element',
-          prefix: 'pngx',
-          style: 'kebab-case',
-        },
-      ],
-    },
-  },
-  {
-    files: ['**/*.html'],
-    languageOptions: {
-      parser: angularTemplateParser,
-    },
-    plugins: {
-      '@angular-eslint/template': angularTemplatePlugin,
-    },
-    rules: {
-      ...angularTemplatePlugin.configs.recommended.rules,
-    },
-  },
-]
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
--- a/src-ui/package.json
+++ b/src-ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "paperless-ngx-ui",
-  "version": "2.20.10",
+  "version": "2.20.9",
  "scripts": {
    "preinstall": "npx only-allow pnpm",
    "ng": "ng",
@@ -44,11 +44,11 @@
    "@angular-builders/jest": "^21.0.3",
    "@angular-devkit/core": "^21.2.0",
    "@angular-devkit/schematics": "^21.2.0",
-    "@angular-eslint/builder": "21.3.0",
-    "@angular-eslint/eslint-plugin": "21.3.0",
-    "@angular-eslint/eslint-plugin-template": "21.3.0",
-    "@angular-eslint/schematics": "21.3.0",
-    "@angular-eslint/template-parser": "21.3.0",
+    "@angular-eslint/builder": "21.2.0",
+    "@angular-eslint/eslint-plugin": "21.2.0",
+    "@angular-eslint/eslint-plugin-template": "21.2.0",
+    "@angular-eslint/schematics": "21.2.0",
+    "@angular-eslint/template-parser": "21.2.0",
    "@angular/build": "^21.2.0",
    "@angular/cli": "~21.2.0",
    "@angular/compiler-cli": "~21.2.0",
@@ -59,7 +59,7 @@
    "@typescript-eslint/eslint-plugin": "^8.54.0",
    "@typescript-eslint/parser": "^8.54.0",
    "@typescript-eslint/utils": "^8.54.0",
-    "eslint": "^10.0.2",
+    "eslint": "^9.39.2",
    "jest": "30.2.0",
    "jest-environment-jsdom": "^30.2.0",
    "jest-junit": "^16.0.0",
--- a/src-ui/pnpm-lock.yaml
+++ b/src-ui/pnpm-lock.yaml
@@ -103,20 +103,20 @@ importers:
        specifier: ^21.2.0
        version: 21.2.0(chokidar@5.0.0)
      '@angular-eslint/builder':
-        specifier: 21.3.0
-        version: 21.3.0(@angular/cli@21.2.0(@types/node@25.3.3)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+        specifier: 21.2.0
+        version: 21.2.0(@angular/cli@21.2.0(@types/node@25.3.3)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@angular-eslint/eslint-plugin':
-        specifier: 21.3.0
-        version: 21.3.0(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+        specifier: 21.2.0
+        version: 21.2.0(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@angular-eslint/eslint-plugin-template':
-        specifier: 21.3.0
-        version: 21.3.0(@angular-eslint/template-parser@21.3.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+        specifier: 21.2.0
+        version: 21.2.0(@angular-eslint/template-parser@21.2.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@angular-eslint/schematics':
-        specifier: 21.3.0
-        version: 21.3.0(@angular-eslint/template-parser@21.3.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(@angular/cli@21.2.0(@types/node@25.3.3)(chokidar@5.0.0))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(chokidar@5.0.0)(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+        specifier: 21.2.0
+        version: 21.2.0(@angular-eslint/template-parser@21.2.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@angular/cli@21.2.0(@types/node@25.3.3)(chokidar@5.0.0))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@angular-eslint/template-parser':
-        specifier: 21.3.0
-        version: 21.3.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+        specifier: 21.2.0
+        version: 21.2.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@angular/build':
        specifier: ^21.2.0
        version: 21.2.0(@angular/compiler-cli@21.2.0(@angular/compiler@21.2.0)(typescript@5.9.3))(@angular/compiler@21.2.0)(@angular/core@21.2.0(@angular/compiler@21.2.0)(rxjs@7.8.2)(zone.js@0.16.1))(@angular/localize@21.2.0(@angular/compiler-cli@21.2.0(@angular/compiler@21.2.0)(typescript@5.9.3))(@angular/compiler@21.2.0))(@angular/platform-browser@21.2.0(@angular/common@21.2.0(@angular/core@21.2.0(@angular/compiler@21.2.0)(rxjs@7.8.2)(zone.js@0.16.1))(rxjs@7.8.2))(@angular/core@21.2.0(@angular/compiler@21.2.0)(rxjs@7.8.2)(zone.js@0.16.1)))(@types/node@25.3.3)(chokidar@5.0.0)(jiti@2.6.1)(less@4.4.2)(postcss@8.5.6)(terser@5.44.1)(tslib@2.8.1)(typescript@5.9.3)(yaml@2.7.0)
@@ -140,16 +140,16 @@ importers:
        version: 25.3.3
      '@typescript-eslint/eslint-plugin':
        specifier: ^8.54.0
-        version: 8.54.0(@typescript-eslint/parser@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+        version: 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@typescript-eslint/parser':
        specifier: ^8.54.0
-        version: 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+        version: 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@typescript-eslint/utils':
        specifier: ^8.54.0
-        version: 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+        version: 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      eslint:
-        specifier: ^10.0.2
-        version: 10.0.2(jiti@2.6.1)
+        specifier: ^9.39.2
+        version: 9.39.2(jiti@2.6.1)
      jest:
        specifier: 30.2.0
        version: 30.2.0(@types/node@25.3.3)(ts-node@10.9.2(@types/node@25.3.3)(typescript@5.9.3))
@@ -364,48 +364,48 @@ packages:
    resolution: {integrity: sha512-3kn3FI5v7BQ7Zct6raek+WgvyDwOJ8wElbyC903GxMQCDBRGGcevhHvTAIHhknihEsrgplzPhTlWeMbk1JfdFg==}
    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}

-  '@angular-eslint/builder@21.3.0':
-    resolution: {integrity: sha512-26QUUouei52biUFAlJSrWNAU9tuF2miKwd8uHdxWwCF31xz+OxC5+NfudWvt1AFaYow7gWueX1QX3rNNtSPDrg==}
+  '@angular-eslint/builder@21.2.0':
+    resolution: {integrity: sha512-wcp3J9cbrDwSeI/o1D/DSvMQa8zpKjc5WhRGTx33omhWijCfiVNEAiBLWiEx5Sb/dWcoX8yFNWY5jSgFVy9Sjw==}
    peerDependencies:
      '@angular/cli': '>= 21.0.0 < 22.0.0'
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      eslint: ^8.57.0 || ^9.0.0
      typescript: '*'

-  '@angular-eslint/bundled-angular-compiler@21.3.0':
-    resolution: {integrity: sha512-l521I24J9gJxyMbRkrM24Tc7W8J8BP+TDAmVs2nT8+lXbS3kg8QpWBRtd+hNUgq6o+vt+lKBkytnEfu8OiqeRg==}
+  '@angular-eslint/bundled-angular-compiler@21.2.0':
+    resolution: {integrity: sha512-J0DWL+j6t9ItFIyIADvzHGqwDA1qfVJ9bx+oTmJ/Hlo7cUpIRoXpcTXpug0CEEABFH0RfDu6PDG2b0FoZ1+7bg==}

-  '@angular-eslint/eslint-plugin-template@21.3.0':
-    resolution: {integrity: sha512-lVixd/KypPWgA/5/pUOhJV9MTcaHjYZEqyOi+IiLk+h+maGxn6/s6Ot+20n+XGS85zAgOY+qUw6EEQ11hoojIQ==}
+  '@angular-eslint/eslint-plugin-template@21.2.0':
+    resolution: {integrity: sha512-lJ13Dj0DjR6YiceQR0sRbyWzSzOQ6uZPwK9CJUF3wuZjYAUvL1D61zaU9QrVLtf89NVOxv+dYZHDdu3IDeIqbA==}
    peerDependencies:
-      '@angular-eslint/template-parser': 21.3.0
+      '@angular-eslint/template-parser': 21.2.0
      '@typescript-eslint/types': ^7.11.0 || ^8.0.0
      '@typescript-eslint/utils': ^7.11.0 || ^8.0.0
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      eslint: ^8.57.0 || ^9.0.0
      typescript: '*'

-  '@angular-eslint/eslint-plugin@21.3.0':
-    resolution: {integrity: sha512-Whf/AUUBekOlfSJRS78m76YGrBQAZ3waXE7oOdlW5xEQvn8jBDN9EGuNnjg/syZzvzjK4ZpYC4g1XYXrc+fQIg==}
+  '@angular-eslint/eslint-plugin@21.2.0':
+    resolution: {integrity: sha512-X2Qn2viDsjm91CEMxNrxDH3qkKpp6un0C1F1BW2p/m9J4AUVfOcXwWz9UpHFSHTRQ+YlTJbiH1ZwwAPeKhFaxA==}
    peerDependencies:
      '@typescript-eslint/utils': ^7.11.0 || ^8.0.0
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      eslint: ^8.57.0 || ^9.0.0
      typescript: '*'

-  '@angular-eslint/schematics@21.3.0':
-    resolution: {integrity: sha512-8deU/zVY9f8k8kAQQ9PL130ox2VlrZw3fMxgsPNAY5tjQ0xk0J2YVSszYHhcqdMGG1J01IsxIjvQaJ4pFfEmMw==}
+  '@angular-eslint/schematics@21.2.0':
+    resolution: {integrity: sha512-WtT4fPKIUQ/hswy+l2GF/rKOdD+42L3fUzzcwRzNutQbe2tU9SimoSOAsay/ylWEuhIOQTs7ysPB8fUgFQoLpA==}
    peerDependencies:
      '@angular/cli': '>= 21.0.0 < 22.0.0'

-  '@angular-eslint/template-parser@21.3.0':
-    resolution: {integrity: sha512-ysyou1zAY6M6rSZNdIcYKGd4nk6TCapamyFNB3ivmTlVZ0O35TS9o/rJ0aUttuHgDp+Ysgs3ql+LA746PXgCyQ==}
+  '@angular-eslint/template-parser@21.2.0':
+    resolution: {integrity: sha512-TCb3qYOC/uXKZCo56cJ6N9sHeWdFhyVqrbbYfFjTi09081T6jllgHDZL5Ms7gOMNY8KywWGGbhxwvzeA0RwTgA==}
    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      eslint: ^8.57.0 || ^9.0.0
      typescript: '*'

-  '@angular-eslint/utils@21.3.0':
-    resolution: {integrity: sha512-oNigH6w3l+owTMboj/uFG0tHOy43uH8BpQRtBOQL1/s2+5in/BJ2Fjobv3SyizxTgeJ1FhRefbkT8GmVjK7jAA==}
+  '@angular-eslint/utils@21.2.0':
+    resolution: {integrity: sha512-E19/hkuvHoNFvctBkmEiGWpy2bbC6cgbr3GNVrn2nGtbI4jnwnDFCGHv50I4LBfvj0PA9E6TWe73ejJ5qoMJWQ==}
    peerDependencies:
      '@typescript-eslint/utils': ^7.11.0 || ^8.0.0
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      eslint: ^8.57.0 || ^9.0.0
      typescript: '*'

  '@angular/build@21.1.2':
@@ -1579,25 +1579,33 @@ packages:
    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}

-  '@eslint/config-array@0.23.2':
-    resolution: {integrity: sha512-YF+fE6LV4v5MGWRGj7G404/OZzGNepVF8fxk7jqmqo3lrza7a0uUcDnROGRBG1WFC1omYUS/Wp1f42i0M+3Q3A==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  '@eslint/config-array@0.21.1':
+    resolution: {integrity: sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@eslint/config-helpers@0.5.2':
-    resolution: {integrity: sha512-a5MxrdDXEvqnIq+LisyCX6tQMPF/dSJpCfBgBauY+pNZ28yCtSsTvyTYrMhaI+LK26bVyCJfJkT0u8KIj2i1dQ==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  '@eslint/config-helpers@0.4.2':
+    resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@eslint/core@1.1.0':
-    resolution: {integrity: sha512-/nr9K9wkr3P1EzFTdFdMoLuo1PmIxjmwvPozwoSodjNBdefGujXQUF93u1DDZpEaTuDvMsIQddsd35BwtrW9Xw==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  '@eslint/core@0.17.0':
+    resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@eslint/object-schema@3.0.2':
-    resolution: {integrity: sha512-HOy56KJt48Bx8KmJ+XGQNSUMT/6dZee/M54XyUyuvTvPXJmsERRvBchsUVx1UMe1WwIH49XLAczNC7V2INsuUw==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  '@eslint/eslintrc@3.3.3':
+    resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@eslint/plugin-kit@0.6.0':
-    resolution: {integrity: sha512-bIZEUzOI1jkhviX2cp5vNyXQc6olzb2ohewQubuYlMXZ2Q/XjBO0x0XhGPvc9fjSIiUN0vw+0hq53BJ4eQSJKQ==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  '@eslint/js@9.39.2':
+    resolution: {integrity: sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/object-schema@2.1.7':
+    resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/plugin-kit@0.4.1':
+    resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  '@fastify/busboy@2.1.1':
    resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
@@ -3316,8 +3324,8 @@ packages:
    peerDependencies:
      ajv: ^8.8.2

-  ajv@6.14.0:
-    resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
+  ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}

  ajv@8.17.1:
    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
@@ -4016,8 +4024,12 @@ packages:
    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
    engines: {node: '>=8.0.0'}

-  eslint-scope@9.1.1:
-    resolution: {integrity: sha512-GaUN0sWim5qc8KVErfPBWmc31LEsOkrUJbvJZV+xuL3u2phMUK4HIvXlWAakfC8W4nzlK+chPEAkYOYb5ZScIw==}
+  eslint-scope@8.4.0:
+    resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-scope@9.1.0:
+    resolution: {integrity: sha512-CkWE42hOJsNj9FJRaoMX9waUFYhqY4jmyLFdAdzZr6VaCg3ynLYx4WnOdkaIifGfH4gsUcBTn4OZbHXkpLD0FQ==}
    engines: {node: ^20.19.0 || ^22.13.0 || >=24}

  eslint-visitor-keys@3.4.3:
@@ -4028,13 +4040,9 @@ packages:
    resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  eslint-visitor-keys@5.0.1:
-    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
-
-  eslint@10.0.2:
-    resolution: {integrity: sha512-uYixubwmqJZH+KLVYIVKY1JQt7tysXhtj21WSvjcSmU5SVNzMus1bgLe+pAt816yQ8opKfheVVoPLqvVMGejYw==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  eslint@9.39.2:
+    resolution: {integrity: sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    hasBin: true
    peerDependencies:
      jiti: '*'
@@ -4042,9 +4050,9 @@ packages:
      jiti:
        optional: true

-  espree@11.1.1:
-    resolution: {integrity: sha512-AVHPqQoZYc+RUM4/3Ly5udlZY/U4LS8pIG05jEjWM2lQMU/oaZ7qshzAl2YP1tfNmXfftH3ohurfwNAug+MnsQ==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  espree@10.4.0:
+    resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  esprima@4.0.1:
    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
@@ -4308,6 +4316,10 @@ packages:
    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me

+  globals@14.0.0:
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
+
  gopd@1.2.0:
    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
    engines: {node: '>= 0.4'}
@@ -4962,6 +4974,9 @@ packages:
  lodash.memoize@4.1.2:
    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}

+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
  lodash@4.17.23:
    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}

@@ -5095,6 +5110,9 @@ packages:
    resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==}
    engines: {node: 18 || 20 || >=22}

+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
  minimatch@3.1.5:
    resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}

@@ -7105,48 +7123,48 @@ snapshots:
    transitivePeerDependencies:
      - chokidar

-  '@angular-eslint/builder@21.3.0(@angular/cli@21.2.0(@types/node@25.3.3)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@angular-eslint/builder@21.2.0(@angular/cli@21.2.0(@types/node@25.3.3)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
-      '@angular-devkit/architect': 0.2102.0(chokidar@5.0.0)
+      '@angular-devkit/architect': 0.2101.2(chokidar@5.0.0)
      '@angular-devkit/core': 21.2.0(chokidar@5.0.0)
      '@angular/cli': 21.2.0(@types/node@25.3.3)(chokidar@5.0.0)
-      eslint: 10.0.2(jiti@2.6.1)
+      eslint: 9.39.2(jiti@2.6.1)
      typescript: 5.9.3
    transitivePeerDependencies:
      - chokidar

-  '@angular-eslint/bundled-angular-compiler@21.3.0': {}
+  '@angular-eslint/bundled-angular-compiler@21.2.0': {}

-  '@angular-eslint/eslint-plugin-template@21.3.0(@angular-eslint/template-parser@21.3.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@angular-eslint/eslint-plugin-template@21.2.0(@angular-eslint/template-parser@21.2.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
-      '@angular-eslint/bundled-angular-compiler': 21.3.0
-      '@angular-eslint/template-parser': 21.3.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
-      '@angular-eslint/utils': 21.3.0(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+      '@angular-eslint/bundled-angular-compiler': 21.2.0
+      '@angular-eslint/template-parser': 21.2.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@angular-eslint/utils': 21.2.0(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@typescript-eslint/types': 8.54.0
-      '@typescript-eslint/utils': 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      aria-query: 5.3.2
      axobject-query: 4.1.0
-      eslint: 10.0.2(jiti@2.6.1)
+      eslint: 9.39.2(jiti@2.6.1)
      typescript: 5.9.3

-  '@angular-eslint/eslint-plugin@21.3.0(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@angular-eslint/eslint-plugin@21.2.0(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
-      '@angular-eslint/bundled-angular-compiler': 21.3.0
-      '@angular-eslint/utils': 21.3.0(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
-      eslint: 10.0.2(jiti@2.6.1)
+      '@angular-eslint/bundled-angular-compiler': 21.2.0
+      '@angular-eslint/utils': 21.2.0(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.39.2(jiti@2.6.1)
      ts-api-utils: 2.4.0(typescript@5.9.3)
      typescript: 5.9.3

-  '@angular-eslint/schematics@21.3.0(@angular-eslint/template-parser@21.3.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(@angular/cli@21.2.0(@types/node@25.3.3)(chokidar@5.0.0))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(chokidar@5.0.0)(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@angular-eslint/schematics@21.2.0(@angular-eslint/template-parser@21.2.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@angular/cli@21.2.0(@types/node@25.3.3)(chokidar@5.0.0))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
      '@angular-devkit/core': 21.2.0(chokidar@5.0.0)
      '@angular-devkit/schematics': 21.2.0(chokidar@5.0.0)
-      '@angular-eslint/eslint-plugin': 21.3.0(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
-      '@angular-eslint/eslint-plugin-template': 21.3.0(@angular-eslint/template-parser@21.3.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+      '@angular-eslint/eslint-plugin': 21.2.0(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@angular-eslint/eslint-plugin-template': 21.2.0(@angular-eslint/template-parser@21.2.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@typescript-eslint/types@8.54.0)(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@angular/cli': 21.2.0(@types/node@25.3.3)(chokidar@5.0.0)
      ignore: 7.0.5
-      semver: 7.7.4
+      semver: 7.7.3
      strip-json-comments: 3.1.1
    transitivePeerDependencies:
      - '@angular-eslint/template-parser'
@@ -7156,18 +7174,18 @@ snapshots:
      - eslint
      - typescript

-  '@angular-eslint/template-parser@21.3.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@angular-eslint/template-parser@21.2.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
-      '@angular-eslint/bundled-angular-compiler': 21.3.0
-      eslint: 10.0.2(jiti@2.6.1)
-      eslint-scope: 9.1.1
+      '@angular-eslint/bundled-angular-compiler': 21.2.0
+      eslint: 9.39.2(jiti@2.6.1)
+      eslint-scope: 9.1.0
      typescript: 5.9.3

-  '@angular-eslint/utils@21.3.0(@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@angular-eslint/utils@21.2.0(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
-      '@angular-eslint/bundled-angular-compiler': 21.3.0
-      '@typescript-eslint/utils': 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
-      eslint: 10.0.2(jiti@2.6.1)
+      '@angular-eslint/bundled-angular-compiler': 21.2.0
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.39.2(jiti@2.6.1)
      typescript: 5.9.3

  '@angular/build@21.1.2(@angular/compiler-cli@21.2.0(@angular/compiler@21.2.0)(typescript@5.9.3))(@angular/compiler@21.2.0)(@angular/core@21.2.0(@angular/compiler@21.2.0)(rxjs@7.8.2)(zone.js@0.16.1))(@angular/localize@21.2.0(@angular/compiler-cli@21.2.0(@angular/compiler@21.2.0)(typescript@5.9.3))(@angular/compiler@21.2.0))(@angular/platform-browser@21.2.0(@angular/common@21.2.0(@angular/core@21.2.0(@angular/compiler@21.2.0)(rxjs@7.8.2)(zone.js@0.16.1))(rxjs@7.8.2))(@angular/core@21.2.0(@angular/compiler@21.2.0)(rxjs@7.8.2)(zone.js@0.16.1)))(@types/node@25.3.3)(chokidar@5.0.0)(jiti@2.6.1)(less@4.4.2)(postcss@8.5.6)(terser@5.44.1)(tslib@2.8.1)(typescript@5.9.3)(yaml@2.7.0)':
@@ -8404,34 +8422,50 @@ snapshots:
  '@esbuild/win32-x64@0.27.3':
    optional: true

-  '@eslint-community/eslint-utils@4.9.1(eslint@10.0.2(jiti@2.6.1))':
+  '@eslint-community/eslint-utils@4.9.1(eslint@9.39.2(jiti@2.6.1))':
    dependencies:
-      eslint: 10.0.2(jiti@2.6.1)
+      eslint: 9.39.2(jiti@2.6.1)
      eslint-visitor-keys: 3.4.3

  '@eslint-community/regexpp@4.12.2': {}

-  '@eslint/config-array@0.23.2':
+  '@eslint/config-array@0.21.1':
    dependencies:
-      '@eslint/object-schema': 3.0.2
+      '@eslint/object-schema': 2.1.7
      debug: 4.4.3
-      minimatch: 10.2.4
+      minimatch: 3.1.2
    transitivePeerDependencies:
      - supports-color

-  '@eslint/config-helpers@0.5.2':
+  '@eslint/config-helpers@0.4.2':
    dependencies:
-      '@eslint/core': 1.1.0
+      '@eslint/core': 0.17.0

-  '@eslint/core@1.1.0':
+  '@eslint/core@0.17.0':
    dependencies:
      '@types/json-schema': 7.0.15

-  '@eslint/object-schema@3.0.2': {}
-
-  '@eslint/plugin-kit@0.6.0':
+  '@eslint/eslintrc@3.3.3':
    dependencies:
-      '@eslint/core': 1.1.0
+      ajv: 6.12.6
+      debug: 4.4.3
+      espree: 10.4.0
+      globals: 14.0.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
+      js-yaml: 4.1.1
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@9.39.2': {}
+
+  '@eslint/object-schema@2.1.7': {}
+
+  '@eslint/plugin-kit@0.4.1':
+    dependencies:
+      '@eslint/core': 0.17.0
      levn: 0.4.1

  '@fastify/busboy@2.1.1': {}
@@ -9810,15 +9844,15 @@ snapshots:
    dependencies:
      '@types/yargs-parser': 21.0.3

-  '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3))(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
      '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@typescript-eslint/scope-manager': 8.54.0
-      '@typescript-eslint/type-utils': 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/type-utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      '@typescript-eslint/visitor-keys': 8.54.0
-      eslint: 10.0.2(jiti@2.6.1)
+      eslint: 9.39.2(jiti@2.6.1)
      ignore: 7.0.5
      natural-compare: 1.4.0
      ts-api-utils: 2.4.0(typescript@5.9.3)
@@ -9826,14 +9860,14 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/parser@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
      '@typescript-eslint/scope-manager': 8.54.0
      '@typescript-eslint/types': 8.54.0
      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
      '@typescript-eslint/visitor-keys': 8.54.0
      debug: 4.4.3
-      eslint: 10.0.2(jiti@2.6.1)
+      eslint: 9.39.2(jiti@2.6.1)
      typescript: 5.9.3
    transitivePeerDependencies:
      - supports-color
@@ -9856,13 +9890,13 @@ snapshots:
    dependencies:
      typescript: 5.9.3

-  '@typescript-eslint/type-utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/type-utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
      '@typescript-eslint/types': 8.54.0
      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
      debug: 4.4.3
-      eslint: 10.0.2(jiti@2.6.1)
+      eslint: 9.39.2(jiti@2.6.1)
      ts-api-utils: 2.4.0(typescript@5.9.3)
      typescript: 5.9.3
    transitivePeerDependencies:
@@ -9885,13 +9919,13 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/utils@8.54.0(eslint@10.0.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.0.2(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
      '@typescript-eslint/scope-manager': 8.54.0
      '@typescript-eslint/types': 8.54.0
      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
-      eslint: 10.0.2(jiti@2.6.1)
+      eslint: 9.39.2(jiti@2.6.1)
      typescript: 5.9.3
    transitivePeerDependencies:
      - supports-color
@@ -10102,7 +10136,7 @@ snapshots:
      ajv: 8.18.0
      fast-deep-equal: 3.1.3

-  ajv@6.14.0:
+  ajv@6.12.6:
    dependencies:
      fast-deep-equal: 3.1.3
      fast-json-stable-stringify: 2.1.0
@@ -10871,7 +10905,12 @@ snapshots:
      esrecurse: 4.3.0
      estraverse: 4.3.0

-  eslint-scope@9.1.1:
+  eslint-scope@8.4.0:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-scope@9.1.0:
    dependencies:
      '@types/esrecurse': 4.3.1
      '@types/estree': 1.0.8
@@ -10882,27 +10921,28 @@ snapshots:

  eslint-visitor-keys@4.2.1: {}

-  eslint-visitor-keys@5.0.1: {}
-
-  eslint@10.0.2(jiti@2.6.1):
+  eslint@9.39.2(jiti@2.6.1):
    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.0.2(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
      '@eslint-community/regexpp': 4.12.2
-      '@eslint/config-array': 0.23.2
-      '@eslint/config-helpers': 0.5.2
-      '@eslint/core': 1.1.0
-      '@eslint/plugin-kit': 0.6.0
+      '@eslint/config-array': 0.21.1
+      '@eslint/config-helpers': 0.4.2
+      '@eslint/core': 0.17.0
+      '@eslint/eslintrc': 3.3.3
+      '@eslint/js': 9.39.2
+      '@eslint/plugin-kit': 0.4.1
      '@humanfs/node': 0.16.7
      '@humanwhocodes/module-importer': 1.0.1
      '@humanwhocodes/retry': 0.4.3
      '@types/estree': 1.0.8
-      ajv: 6.14.0
+      ajv: 6.12.6
+      chalk: 4.1.2
      cross-spawn: 7.0.6
      debug: 4.4.3
      escape-string-regexp: 4.0.0
-      eslint-scope: 9.1.1
-      eslint-visitor-keys: 5.0.1
-      espree: 11.1.1
+      eslint-scope: 8.4.0
+      eslint-visitor-keys: 4.2.1
+      espree: 10.4.0
      esquery: 1.7.0
      esutils: 2.0.3
      fast-deep-equal: 3.1.3
@@ -10913,7 +10953,8 @@ snapshots:
      imurmurhash: 0.1.4
      is-glob: 4.0.3
      json-stable-stringify-without-jsonify: 1.0.1
-      minimatch: 10.2.4
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
      natural-compare: 1.4.0
      optionator: 0.9.4
    optionalDependencies:
@@ -10921,11 +10962,11 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  espree@11.1.1:
+  espree@10.4.0:
    dependencies:
      acorn: 8.16.0
      acorn-jsx: 5.3.2(acorn@8.16.0)
-      eslint-visitor-keys: 5.0.1
+      eslint-visitor-keys: 4.2.1

  esprima@4.0.1: {}

@@ -11243,6 +11284,8 @@ snapshots:
      once: 1.4.0
      path-is-absolute: 1.0.1

+  globals@14.0.0: {}
+
  gopd@1.2.0: {}

  graceful-fs@4.2.11: {}
@@ -12134,6 +12177,8 @@ snapshots:

  lodash.memoize@4.1.2: {}

+  lodash.merge@4.6.2: {}
+
  lodash@4.17.23: {}

  log-symbols@7.0.1:
@@ -12269,6 +12314,10 @@ snapshots:
    dependencies:
      brace-expansion: 5.0.4

+  minimatch@3.1.2:
+    dependencies:
+      brace-expansion: 1.1.12
+
  minimatch@3.1.5:
    dependencies:
      brace-expansion: 1.1.12
--- a/src-ui/src/app/components/admin/settings/settings.component.html
+++ b/src-ui/src/app/components/admin/settings/settings.component.html
@@ -277,7 +277,7 @@
              <div class="col">
                <select class="form-select" formControlName="pdfEditorDefaultEditMode">
                  <option [ngValue]="PdfEditorEditMode.Create" i18n>Create new document(s)</option>
-                  <option [ngValue]="PdfEditorEditMode.Update" i18n>Add document version</option>
+                  <option [ngValue]="PdfEditorEditMode.Update" i18n>Update existing document</option>
                </select>
              </div>
            </div>
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -99,7 +99,12 @@
        </ul>

        <div class="nav-group mt-3 mb-1" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.SavedView }">
-          @if (savedViewService.sidebarViews?.length > 0) {
+          @if (savedViewService.loading) {
+            <h6 class="sidebar-heading px-3 text-muted">
+              <span i18n>Saved views</span>
+              <div class="spinner-border spinner-border-sm fw-normal ms-2" role="status"></div>
+            </h6>
+          } @else if (savedViewService.sidebarViews?.length > 0) {
            <h6 class="sidebar-heading px-3 text-muted">
              <span i18n>Saved views</span>
            </h6>
@@ -129,11 +134,6 @@
                </li>
              }
            </ul>
-          } @else if (savedViewService.loading) {
-            <h6 class="sidebar-heading px-3 text-muted">
-              <span i18n>Saved views</span>
-              <div class="spinner-border spinner-border-sm fw-normal ms-2" role="status"></div>
-            </h6>
          }
        </div>

--- a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html
+++ b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html
@@ -10,22 +10,10 @@
        <ul class="list-group"
            cdkDropList
            (cdkDropListDropped)="onDrop($event)">
-            @for (document of documents; track document.id) {
-                <li class="list-group-item d-flex align-items-center" cdkDrag>
+            @for (documentID of documentIDs; track documentID) {
+                <li class="list-group-item" cdkDrag>
                    <i-bs name="grip-vertical" class="me-2"></i-bs>
-                    <div class="d-flex flex-column">
-                        <div>
-                          @if (document.correspondent) {
-                            <b>{{document.correspondent | correspondentName | async}}: </b>
-                          }{{document.title}}
-                        </div>
-                        <small class="text-muted">
-                          {{document.created | customDate:'mediumDate'}}
-                          @if (document.page_count) {
-                            | {document.page_count, plural, =1 {One page} other {{{document.page_count}} pages}}
-                          }
-                        </small>
-                    </div>
+                    {{getDocument(documentID)?.title}}
                </li>
            }
        </ul>
--- a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts
+++ b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts
@@ -3,14 +3,11 @@ import {
  DragDropModule,
  moveItemInArray,
 } from '@angular/cdk/drag-drop'
-import { AsyncPipe } from '@angular/common'
 import { Component, OnInit, inject } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { takeUntil } from 'rxjs'
 import { Document } from 'src/app/data/document'
-import { CorrespondentNamePipe } from 'src/app/pipes/correspondent-name.pipe'
-import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { PermissionsService } from 'src/app/services/permissions.service'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { ConfirmDialogComponent } from '../confirm-dialog.component'
@@ -20,9 +17,6 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component'
  templateUrl: './merge-confirm-dialog.component.html',
  styleUrl: './merge-confirm-dialog.component.scss',
  imports: [
-    AsyncPipe,
-    CorrespondentNamePipe,
-    CustomDatePipe,
    DragDropModule,
    FormsModule,
    ReactiveFormsModule,
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
@@ -20,9 +20,9 @@ import { Subject, filter, takeUntil } from 'rxjs'
 import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
 import { MatchingModel } from 'src/app/data/matching-model'
 import { ObjectWithPermissions } from 'src/app/data/object-with-permissions'
-import { SelectionDataItem } from 'src/app/data/results'
 import { FilterPipe } from 'src/app/pipes/filter.pipe'
 import { HotKeyService } from 'src/app/services/hot-key.service'
+import { SelectionDataItem } from 'src/app/services/rest/document.service'
 import { pngxPopperOptions } from 'src/app/utils/popper-options'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
 import { ClearableBadgeComponent } from '../clearable-badge/clearable-badge.component'
--- a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.html
+++ b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.html
@@ -84,7 +84,7 @@
      <input type="radio" class="btn-check" [(ngModel)]="editMode" [value]="PdfEditorEditMode.Update" id="editModeUpdate" name="editmode" [disabled]="hasSplit()">
      <label for="editModeUpdate" class="btn btn-outline-primary btn-sm">
        <i-bs name="pencil"></i-bs>
-        <span class="form-check-label ms-2" i18n>Add document version</span>
+        <span class="form-check-label ms-2" i18n>Update existing document</span>
      </label>
    </div>
    @if (editMode === PdfEditorEditMode.Create) {
--- a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.spec.ts
+++ b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.spec.ts
@@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { DocumentService } from 'src/app/services/rest/document.service'
 import { PDFEditorComponent } from './pdf-editor.component'

 describe('PDFEditorComponent', () => {
@@ -140,16 +139,4 @@ describe('PDFEditorComponent', () => {
    expect(component.pages[1].page).toBe(2)
    expect(component.pages[2].page).toBe(3)
  })
-
-  it('should include selected version in preview source when provided', () => {
-    const documentService = TestBed.inject(DocumentService)
-    const previewSpy = jest
-      .spyOn(documentService, 'getPreviewUrl')
-      .mockReturnValue('preview-version')
-    component.documentID = 3
-    component.versionID = 10
-
-    expect(component.pdfSrc).toBe('preview-version')
-    expect(previewSpy).toHaveBeenCalledWith(3, false, 10)
-  })
 })
--- a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts
+++ b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts
@@ -46,7 +46,6 @@ export class PDFEditorComponent extends ConfirmDialogComponent {
  activeModal: NgbActiveModal = inject(NgbActiveModal)

  documentID: number
-  versionID?: number
  pages: PageOperation[] = []
  totalPages = 0
  editMode: PdfEditorEditMode = this.settingsService.get(
@@ -56,11 +55,7 @@ export class PDFEditorComponent extends ConfirmDialogComponent {
  includeMetadata: boolean = true

  get pdfSrc(): string {
-    return this.documentService.getPreviewUrl(
-      this.documentID,
-      false,
-      this.versionID
-    )
+    return this.documentService.getPreviewUrl(this.documentID)
  }

  pdfLoaded(pdf: PngxPdfDocumentProxy) {
--- a/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.html
+++ b/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.html
@@ -16,12 +16,6 @@
    </div>
  </form>

-  @if (note) {
-    <div class="small text-muted fst-italic mt-2">
-      {{ note }}
-    </div>
-  }
-
 </div>
 <div class="modal-footer">
  @if (!buttonsEnabled) {
--- a/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.ts
+++ b/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.ts
@@ -40,9 +40,6 @@ export class PermissionsDialogComponent {
  @Input()
  title = $localize`Set permissions`

-  @Input()
-  note: string = null
-
  @Input()
  set object(o: ObjectWithPermissions) {
    this.o = o
--- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
@@ -65,7 +65,6 @@ import { TagService } from 'src/app/services/rest/tag.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
-import { WebsocketStatusService } from 'src/app/services/websocket-status.service'
 import { environment } from 'src/environments/environment'
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
 import { PasswordRemovalConfirmDialogComponent } from '../common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component'
@@ -84,9 +83,9 @@ const doc: Document = {
  storage_path: 31,
  tags: [41, 42, 43],
  content: 'text content',
-  added: new Date('May 4, 2014 03:24:00').toISOString(),
-  created: new Date('May 4, 2014 03:24:00').toISOString(),
-  modified: new Date('May 4, 2014 03:24:00').toISOString(),
+  added: new Date('May 4, 2014 03:24:00'),
+  created: new Date('May 4, 2014 03:24:00'),
+  modified: new Date('May 4, 2014 03:24:00'),
  archive_serial_number: null,
  original_file_name: 'file.pdf',
  owner: null,
@@ -328,29 +327,6 @@ describe('DocumentDetailComponent', () => {
    expect(component.activeNavID).toEqual(component.DocumentDetailNavIDs.Notes)
  })

-  it('should switch from preview to details when pdf preview enters the DOM', fakeAsync(() => {
-    component.nav = {
-      activeId: component.DocumentDetailNavIDs.Preview,
-      select: jest.fn(),
-    } as any
-    ;(component as any).pdfPreview = {
-      nativeElement: { offsetParent: {} },
-    }
-
-    tick()
-    expect(component.nav.select).toHaveBeenCalledWith(
-      component.DocumentDetailNavIDs.Details
-    )
-  }))
-
-  it('should forward title key up value to titleSubject', () => {
-    const subjectSpy = jest.spyOn(component.titleSubject, 'next')
-
-    component.titleKeyUp({ target: { value: 'Updated title' } })
-
-    expect(subjectSpy).toHaveBeenCalledWith('Updated title')
-  })
-
  it('should change url on tab switch', () => {
    initNormally()
    const navigateSpy = jest.spyOn(router, 'navigate')
@@ -548,7 +524,7 @@ describe('DocumentDetailComponent', () => {
    jest.spyOn(documentService, 'get').mockReturnValue(
      of({
        ...doc,
-        modified: '2024-01-02T00:00:00Z',
+        modified: new Date('2024-01-02T00:00:00Z'),
        duplicate_documents: updatedDuplicates,
      })
    )
@@ -950,8 +926,8 @@ describe('DocumentDetailComponent', () => {

  it('should support reprocess, confirm and close modal after started', () => {
    initNormally()
-    const reprocessSpy = jest.spyOn(documentService, 'reprocessDocuments')
-    reprocessSpy.mockReturnValue(of(true))
+    const bulkEditSpy = jest.spyOn(documentService, 'bulkEdit')
+    bulkEditSpy.mockReturnValue(of(true))
    let openModal: NgbModalRef
    modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
    const modalSpy = jest.spyOn(modalService, 'open')
@@ -959,7 +935,7 @@ describe('DocumentDetailComponent', () => {
    component.reprocess()
    const modalCloseSpy = jest.spyOn(openModal, 'close')
    openModal.componentInstance.confirmClicked.next()
-    expect(reprocessSpy).toHaveBeenCalledWith([doc.id])
+    expect(bulkEditSpy).toHaveBeenCalledWith([doc.id], 'reprocess', {})
    expect(modalSpy).toHaveBeenCalled()
    expect(toastSpy).toHaveBeenCalled()
    expect(modalCloseSpy).toHaveBeenCalled()
@@ -967,13 +943,13 @@ describe('DocumentDetailComponent', () => {

  it('should show error if redo ocr call fails', () => {
    initNormally()
-    const reprocessSpy = jest.spyOn(documentService, 'reprocessDocuments')
+    const bulkEditSpy = jest.spyOn(documentService, 'bulkEdit')
    let openModal: NgbModalRef
    modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
    const toastSpy = jest.spyOn(toastService, 'showError')
    component.reprocess()
    const modalCloseSpy = jest.spyOn(openModal, 'close')
-    reprocessSpy.mockReturnValue(throwError(() => new Error('error occurred')))
+    bulkEditSpy.mockReturnValue(throwError(() => new Error('error occurred')))
    openModal.componentInstance.confirmClicked.next()
    expect(toastSpy).toHaveBeenCalled()
    expect(modalCloseSpy).not.toHaveBeenCalled()
@@ -1410,21 +1386,17 @@ describe('DocumentDetailComponent', () => {
    expect(errorSpy).toHaveBeenCalled()
  })

-  it('should show incoming update modal when open local draft is older than backend on init', () => {
+  it('should warn when open document does not match doc retrieved from backend on init', () => {
    let openModal: NgbModalRef
    modalService.activeInstances.subscribe((modals) => (openModal = modals[0]))
    const modalSpy = jest.spyOn(modalService, 'open')
-    const openDoc = Object.assign({}, doc, {
-      __changedFields: ['title'],
-    })
+    const openDoc = Object.assign({}, doc)
    // simulate a document being modified elsewhere and db updated
-    const remoteDoc = Object.assign({}, doc, {
-      modified: new Date(new Date(doc.modified).getTime() + 1000).toISOString(),
-    })
+    doc.modified = new Date()
    jest
      .spyOn(activatedRoute, 'paramMap', 'get')
      .mockReturnValue(of(convertToParamMap({ id: 3, section: 'details' })))
-    jest.spyOn(documentService, 'get').mockReturnValueOnce(of(remoteDoc))
+    jest.spyOn(documentService, 'get').mockReturnValueOnce(of(doc))
    jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
    jest.spyOn(customFieldsService, 'listAll').mockReturnValue(
      of({
@@ -1434,185 +1406,11 @@ describe('DocumentDetailComponent', () => {
      })
    )
    fixture.detectChanges() // calls ngOnInit
-    expect(modalSpy).toHaveBeenCalledWith(ConfirmDialogComponent, {
-      backdrop: 'static',
-    })
+    expect(modalSpy).toHaveBeenCalledWith(ConfirmDialogComponent)
+    const closeSpy = jest.spyOn(openModal, 'close')
    const confirmDialog = openModal.componentInstance as ConfirmDialogComponent
-    expect(confirmDialog.messageBold).toContain('Document was updated at')
-  })
-
-  it('should react to websocket document updated notifications', () => {
-    initNormally()
-    const updateMessage = {
-      document_id: component.documentId,
-      modified: '2026-02-17T00:00:00Z',
-      owner_id: 1,
-    }
-    const handleSpy = jest
-      .spyOn(component as any, 'handleIncomingDocumentUpdated')
-      .mockImplementation(() => {})
-    const websocketStatusService = TestBed.inject(WebsocketStatusService)
-
-    websocketStatusService.handleDocumentUpdated(updateMessage)
-
-    expect(handleSpy).toHaveBeenCalledWith(updateMessage)
-  })
-
-  it('should queue incoming update while network is active and flush after', () => {
-    initNormally()
-    const loadSpy = jest.spyOn(component as any, 'loadDocument')
-    const toastSpy = jest.spyOn(toastService, 'showInfo')
-
-    component.networkActive = true
-    ;(component as any).handleIncomingDocumentUpdated({
-      document_id: component.documentId,
-      modified: '2026-02-17T00:00:00Z',
-    })
-
-    expect(loadSpy).not.toHaveBeenCalled()
-
-    component.networkActive = false
-    ;(component as any).flushPendingIncomingUpdate()
-
-    expect(loadSpy).toHaveBeenCalledWith(component.documentId, true)
-    expect(toastSpy).toHaveBeenCalledWith(
-      'Document reloaded with latest changes.'
-    )
-  })
-
-  it('should ignore queued incoming update matching local save modified', () => {
-    initNormally()
-    const loadSpy = jest.spyOn(component as any, 'loadDocument')
-    const toastSpy = jest.spyOn(toastService, 'showInfo')
-
-    component.networkActive = true
-    ;(component as any).lastLocalSaveModified = '2026-02-17T00:00:00+00:00'
-    ;(component as any).handleIncomingDocumentUpdated({
-      document_id: component.documentId,
-      modified: '2026-02-17T00:00:00+00:00',
-    })
-
-    component.networkActive = false
-    ;(component as any).flushPendingIncomingUpdate()
-
-    expect(loadSpy).not.toHaveBeenCalled()
-    expect(toastSpy).not.toHaveBeenCalled()
-  })
-
-  it('should clear pdf source if preview URL is empty', () => {
-    component.pdfSource = { url: '/preview', password: 'secret' } as any
-    component.previewUrl = null
-    ;(component as any).updatePdfSource()
-
-    expect(component.pdfSource).toEqual({ url: null, password: undefined })
-  })
-
-  it('should close incoming update modal if one is open', () => {
-    const modalRef = { close: jest.fn() } as unknown as NgbModalRef
-    ;(component as any).incomingUpdateModal = modalRef
-    ;(component as any).closeIncomingUpdateModal()
-
-    expect(modalRef.close).toHaveBeenCalled()
-    expect((component as any).incomingUpdateModal).toBeNull()
-  })
-
-  it('should reload remote version when incoming update modal is confirmed', async () => {
-    let openModal: NgbModalRef
-    modalService.activeInstances.subscribe((modals) => (openModal = modals[0]))
-    const reloadSpy = jest
-      .spyOn(component as any, 'reloadRemoteVersion')
-      .mockImplementation(() => {})
-
-    ;(component as any).showIncomingUpdateModal('2026-02-17T00:00:00Z')
-
-    const dialog = openModal.componentInstance as ConfirmDialogComponent
-    dialog.confirmClicked.next()
-    await openModal.result
-
-    expect(dialog.buttonsEnabled).toBe(false)
-    expect(reloadSpy).toHaveBeenCalled()
-    expect((component as any).incomingUpdateModal).toBeNull()
-  })
-
-  it('should overwrite open document state when loading remote version with force', () => {
-    const openDoc = Object.assign({}, doc, {
-      title: 'Locally edited title',
-      __changedFields: ['title'],
-    })
-    const remoteDoc = Object.assign({}, doc, {
-      title: 'Remote title',
-      modified: '2026-02-17T00:00:00Z',
-    })
-    jest.spyOn(documentService, 'get').mockReturnValue(of(remoteDoc))
-    jest.spyOn(documentService, 'getMetadata').mockReturnValue(
-      of({
-        has_archive_version: false,
-        original_mime_type: 'application/pdf',
-      })
-    )
-    jest.spyOn(documentService, 'getSuggestions').mockReturnValue(
-      of({
-        suggested_tags: [],
-        suggested_document_types: [],
-        suggested_correspondents: [],
-      })
-    )
-    jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
-    const setDirtySpy = jest.spyOn(openDocumentsService, 'setDirty')
-    const saveSpy = jest.spyOn(openDocumentsService, 'save')
-
-    ;(component as any).loadDocument(doc.id, true)
-
-    expect(openDoc.title).toEqual('Remote title')
-    expect(openDoc.__changedFields).toEqual([])
-    expect(setDirtySpy).toHaveBeenCalledWith(openDoc, false)
-    expect(saveSpy).toHaveBeenCalled()
-  })
-
-  it('should ignore incoming update for a different document id', () => {
-    initNormally()
-    const loadSpy = jest.spyOn(component as any, 'loadDocument')
-
-    ;(component as any).handleIncomingDocumentUpdated({
-      document_id: component.documentId + 1,
-      modified: '2026-02-17T00:00:00Z',
-    })
-
-    expect(loadSpy).not.toHaveBeenCalled()
-  })
-
-  it('should show incoming update modal when local document has unsaved edits', () => {
-    initNormally()
-    jest.spyOn(openDocumentsService, 'isDirty').mockReturnValue(true)
-    const modalSpy = jest
-      .spyOn(component as any, 'showIncomingUpdateModal')
-      .mockImplementation(() => {})
-
-    ;(component as any).handleIncomingDocumentUpdated({
-      document_id: component.documentId,
-      modified: '2026-02-17T00:00:00Z',
-    })
-
-    expect(modalSpy).toHaveBeenCalledWith('2026-02-17T00:00:00Z')
-  })
-
-  it('should reload current document and show toast when reloading remote version', () => {
-    component.documentId = doc.id
-    const closeModalSpy = jest
-      .spyOn(component as any, 'closeIncomingUpdateModal')
-      .mockImplementation(() => {})
-    const loadSpy = jest
-      .spyOn(component as any, 'loadDocument')
-      .mockImplementation(() => {})
-    const notifySpy = jest.spyOn(component.docChangeNotifier, 'next')
-    const toastSpy = jest.spyOn(toastService, 'showInfo')
-
-    ;(component as any).reloadRemoteVersion()
-
-    expect(closeModalSpy).toHaveBeenCalled()
-    expect(notifySpy).toHaveBeenCalledWith(doc.id)
-    expect(loadSpy).toHaveBeenCalledWith(doc.id, true)
-    expect(toastSpy).toHaveBeenCalledWith('Document reloaded.')
+    confirmDialog.confirmClicked.next(confirmDialog)
+    expect(closeSpy).toHaveBeenCalled()
  })

  it('should change preview element by render type', () => {
@@ -1661,23 +1459,23 @@ describe('DocumentDetailComponent', () => {
    const closeSpy = jest.spyOn(openDocumentsService, 'closeDocument')
    const errorSpy = jest.spyOn(toastService, 'showError')
    initNormally()
-    component.selectedVersionId = 10
    component.editPdf()
    expect(modal).not.toBeUndefined()
    modal.componentInstance.documentID = doc.id
-    expect(modal.componentInstance.versionID).toBe(10)
    modal.componentInstance.pages = [{ page: 1, rotate: 0, splitAfter: false }]
    modal.componentInstance.confirm()
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/edit_pdf/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    expect(req.request.body).toEqual({
-      documents: [10],
-      operations: [{ page: 1, rotate: 0, doc: 0 }],
-      delete_original: false,
-      update_document: false,
-      include_metadata: true,
-      source_mode: 'explicit_selection',
+      documents: [doc.id],
+      method: 'edit_pdf',
+      parameters: {
+        operations: [{ page: 1, rotate: 0, doc: 0 }],
+        delete_original: false,
+        update_document: false,
+        include_metadata: true,
+      },
    })
    req.error(new ErrorEvent('failed'))
    expect(errorSpy).toHaveBeenCalled()
@@ -1688,7 +1486,7 @@ describe('DocumentDetailComponent', () => {
    modal.componentInstance.deleteOriginal = true
    modal.componentInstance.confirm()
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/edit_pdf/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.flush(true)
    expect(closeSpy).toHaveBeenCalled()
@@ -1698,7 +1496,6 @@ describe('DocumentDetailComponent', () => {
    let modal: NgbModalRef
    modalService.activeInstances.subscribe((m) => (modal = m[0]))
    initNormally()
-    component.selectedVersionId = 10
    component.password = 'secret'
    component.removePassword()
    const dialog =
@@ -1708,15 +1505,17 @@ describe('DocumentDetailComponent', () => {
    dialog.deleteOriginal = true
    dialog.confirm()
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/remove_password/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    expect(req.request.body).toEqual({
-      documents: [10],
-      password: 'secret',
-      update_document: false,
-      include_metadata: false,
-      delete_original: true,
-      source_mode: 'explicit_selection',
+      documents: [doc.id],
+      method: 'remove_password',
+      parameters: {
+        password: 'secret',
+        update_document: false,
+        include_metadata: false,
+        delete_original: true,
+      },
    })
    req.flush(true)
  })
@@ -1731,7 +1530,7 @@ describe('DocumentDetailComponent', () => {

    expect(errorSpy).toHaveBeenCalled()
    httpTestingController.expectNone(
-      `${environment.apiBaseUrl}documents/remove_password/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
  })

@@ -1747,7 +1546,7 @@ describe('DocumentDetailComponent', () => {
      modal.componentInstance as PasswordRemovalConfirmDialogComponent
    dialog.confirm()
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/remove_password/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.error(new ErrorEvent('failed'))

@@ -1768,7 +1567,7 @@ describe('DocumentDetailComponent', () => {
      modal.componentInstance as PasswordRemovalConfirmDialogComponent
    dialog.confirm()
    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/remove_password/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.flush(true)

@@ -1922,14 +1721,6 @@ describe('DocumentDetailComponent', () => {
    expect(component.createDisabled(DataType.Tag)).toBeFalsy()
  })

-  it('should expose add permission via userCanAdd getter', () => {
-    currentUserCan = true
-    expect(component.userCanAdd).toBeTruthy()
-
-    currentUserCan = false
-    expect(component.userCanAdd).toBeFalsy()
-  })
-
  it('should call tryRenderTiff when no archive and file is tiff', () => {
    initNormally()
    const tiffRenderSpy = jest.spyOn(
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -13,7 +13,6 @@ import {
  NgbDateStruct,
  NgbDropdownModule,
  NgbModal,
-  NgbModalRef,
  NgbNav,
  NgbNavChangeEvent,
  NgbNavModule,
@@ -74,17 +73,13 @@ import {
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
-import {
-  BulkEditSourceMode,
-  DocumentService,
-} from 'src/app/services/rest/document.service'
+import { DocumentService } from 'src/app/services/rest/document.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { TagService } from 'src/app/services/rest/tag.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
-import { WebsocketStatusService } from 'src/app/services/websocket-status.service'
 import { getFilenameFromContentDisposition } from 'src/app/utils/http'
 import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
 import * as UTIF from 'utif'
@@ -148,11 +143,6 @@ enum ContentRenderType {
  TIFF = 'tiff',
 }

-interface IncomingDocumentUpdate {
-  document_id: number
-  modified: string
-}
-
@Component({
  selector: 'pngx-document-detail',
  templateUrl: './document-detail.component.html',
@@ -218,7 +208,6 @@ export class DocumentDetailComponent
  private componentRouterService = inject(ComponentRouterService)
  private deviceDetectorService = inject(DeviceDetectorService)
  private savedViewService = inject(SavedViewService)
-  private readonly websocketStatusService = inject(WebsocketStatusService)

  @ViewChild('inputTitle')
  titleInput: TextComponent
@@ -278,9 +267,6 @@ export class DocumentDetailComponent
  isDirty$: Observable<boolean>
  unsubscribeNotifier: Subject<any> = new Subject()
  docChangeNotifier: Subject<any> = new Subject()
-  private incomingUpdateModal: NgbModalRef
-  private pendingIncomingUpdate: IncomingDocumentUpdate
-  private lastLocalSaveModified: string | null = null

  requiresPassword: boolean = false
  password: string
@@ -489,12 +475,9 @@ export class DocumentDetailComponent
      )
  }

-  private loadDocument(documentId: number, forceRemote: boolean = false): void {
+  private loadDocument(documentId: number): void {
    let redirectedToRoot = false
-    this.closeIncomingUpdateModal()
-    this.pendingIncomingUpdate = null
    this.selectedVersionId = documentId
-    this.lastLocalSaveModified = null
    this.previewUrl = this.documentsService.getPreviewUrl(
      this.selectedVersionId
    )
@@ -562,25 +545,21 @@ export class DocumentDetailComponent
            openDocument.duplicate_documents = doc.duplicate_documents
            this.openDocumentService.save()
          }
-          let useDoc = openDocument || doc
-          if (openDocument && forceRemote) {
-            Object.assign(openDocument, doc)
-            openDocument.__changedFields = []
-            this.openDocumentService.setDirty(openDocument, false)
-            this.openDocumentService.save()
-            useDoc = openDocument
-          } else if (openDocument) {
-            if (new Date(doc.modified) > new Date(openDocument.modified)) {
-              if (this.hasLocalEdits(openDocument)) {
-                this.showIncomingUpdateModal(doc.modified)
-              } else {
-                // No local edits to preserve, so keep the tab in sync automatically.
-                Object.assign(openDocument, doc)
-                openDocument.__changedFields = []
-                this.openDocumentService.setDirty(openDocument, false)
-                this.openDocumentService.save()
-                useDoc = openDocument
-              }
+          const useDoc = openDocument || doc
+          if (openDocument) {
+            if (
+              new Date(doc.modified) > new Date(openDocument.modified) &&
+              !this.modalService.hasOpenModals()
+            ) {
+              const modal = this.modalService.open(ConfirmDialogComponent)
+              modal.componentInstance.title = $localize`Document changes detected`
+              modal.componentInstance.messageBold = $localize`The version of this document in your browser session appears older than the existing version.`
+              modal.componentInstance.message = $localize`Saving the document here may overwrite other changes that were made. To restore the existing version, discard your changes or close the document.`
+              modal.componentInstance.cancelBtnClass = 'visually-hidden'
+              modal.componentInstance.btnCaption = $localize`Ok`
+              modal.componentInstance.confirmClicked.subscribe(() =>
+                modal.close()
+              )
            }
          } else {
            this.openDocumentService
@@ -611,98 +590,6 @@ export class DocumentDetailComponent
      })
  }

-  private hasLocalEdits(doc: Document): boolean {
-    return (
-      this.openDocumentService.isDirty(doc) || !!doc.__changedFields?.length
-    )
-  }
-
-  private showIncomingUpdateModal(modified: string): void {
-    if (this.incomingUpdateModal) return
-
-    const modal = this.modalService.open(ConfirmDialogComponent, {
-      backdrop: 'static',
-    })
-    this.incomingUpdateModal = modal
-
-    let formattedModified = null
-    const parsed = new Date(modified)
-    formattedModified = parsed.toLocaleString()
-
-    modal.componentInstance.title = $localize`Document was updated`
-    modal.componentInstance.messageBold = $localize`Document was updated at ${formattedModified}.`
-    modal.componentInstance.message = $localize`Reload to discard your local unsaved edits and load the latest remote version.`
-    modal.componentInstance.btnClass = 'btn-warning'
-    modal.componentInstance.btnCaption = $localize`Reload`
-    modal.componentInstance.cancelBtnCaption = $localize`Dismiss`
-
-    modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-      modal.componentInstance.buttonsEnabled = false
-      modal.close()
-      this.reloadRemoteVersion()
-    })
-    modal.result.finally(() => {
-      this.incomingUpdateModal = null
-    })
-  }
-
-  private closeIncomingUpdateModal() {
-    if (!this.incomingUpdateModal) return
-    this.incomingUpdateModal.close()
-    this.incomingUpdateModal = null
-  }
-
-  private flushPendingIncomingUpdate() {
-    if (!this.pendingIncomingUpdate || this.networkActive) return
-    const pendingUpdate = this.pendingIncomingUpdate
-    this.pendingIncomingUpdate = null
-    this.handleIncomingDocumentUpdated(pendingUpdate)
-  }
-
-  private handleIncomingDocumentUpdated(data: IncomingDocumentUpdate): void {
-    if (
-      !this.documentId ||
-      !this.document ||
-      data.document_id !== this.documentId
-    )
-      return
-    if (this.networkActive) {
-      this.pendingIncomingUpdate = data
-      return
-    }
-    // If modified timestamp of the incoming update is the same as the last local save,
-    // we assume this update is from our own save and dont notify
-    const incomingModified = data.modified
-    if (
-      incomingModified &&
-      this.lastLocalSaveModified &&
-      incomingModified === this.lastLocalSaveModified
-    ) {
-      this.lastLocalSaveModified = null
-      return
-    }
-    this.lastLocalSaveModified = null
-
-    if (this.openDocumentService.isDirty(this.document)) {
-      this.showIncomingUpdateModal(data.modified)
-    } else {
-      this.docChangeNotifier.next(this.documentId)
-      this.loadDocument(this.documentId, true)
-      this.toastService.showInfo(
-        $localize`Document reloaded with latest changes.`
-      )
-    }
-  }
-
-  private reloadRemoteVersion() {
-    if (!this.documentId) return
-
-    this.closeIncomingUpdateModal()
-    this.docChangeNotifier.next(this.documentId)
-    this.loadDocument(this.documentId, true)
-    this.toastService.showInfo($localize`Document reloaded.`)
-  }
-
  ngOnInit(): void {
    this.setZoom(
      this.settings.get(SETTINGS_KEYS.PDF_VIEWER_ZOOM_SETTING) as PdfZoomScale
@@ -761,11 +648,6 @@ export class DocumentDetailComponent

    this.getCustomFields()

-    this.websocketStatusService
-      .onDocumentUpdated()
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe((data) => this.handleIncomingDocumentUpdated(data))
-
    this.route.paramMap
      .pipe(
        filter(
@@ -1151,7 +1033,6 @@ export class DocumentDetailComponent
      )
      .subscribe({
        next: (doc) => {
-          this.closeIncomingUpdateModal()
          Object.assign(this.document, doc)
          doc['permissions_form'] = {
            owner: doc.owner,
@@ -1198,8 +1079,6 @@ export class DocumentDetailComponent
      .pipe(first())
      .subscribe({
        next: (docValues) => {
-          this.closeIncomingUpdateModal()
-          this.lastLocalSaveModified = docValues.modified ?? null
          // in case data changed while saving eg removing inbox_tags
          this.documentForm.patchValue(docValues)
          const newValues = Object.assign({}, this.documentForm.value)
@@ -1214,19 +1093,16 @@ export class DocumentDetailComponent
          this.networkActive = false
          this.error = null
          if (close) {
-            this.pendingIncomingUpdate = null
            this.close(() =>
              this.openDocumentService.refreshDocument(this.documentId)
            )
          } else {
            this.openDocumentService.refreshDocument(this.documentId)
-            this.flushPendingIncomingUpdate()
          }
          this.savedViewService.maybeRefreshDocumentCounts()
        },
        error: (error) => {
          this.networkActive = false
-          this.lastLocalSaveModified = null
          const canEdit =
            this.permissionsService.currentUserHasObjectPermissions(
              PermissionAction.Change,
@@ -1246,7 +1122,6 @@ export class DocumentDetailComponent
              error
            )
          }
-          this.flushPendingIncomingUpdate()
        },
      })
  }
@@ -1283,11 +1158,8 @@ export class DocumentDetailComponent
      .pipe(first())
      .subscribe({
        next: ({ updateResult, nextDocId, closeResult }) => {
-          this.closeIncomingUpdateModal()
          this.error = null
          this.networkActive = false
-          this.pendingIncomingUpdate = null
-          this.lastLocalSaveModified = null
          if (closeResult && updateResult && nextDocId) {
            this.router.navigate(['documents', nextDocId])
            this.titleInput?.focus()
@@ -1295,10 +1167,8 @@ export class DocumentDetailComponent
        },
        error: (error) => {
          this.networkActive = false
-          this.lastLocalSaveModified = null
          this.error = error.error
          this.toastService.showError($localize`Error saving document`, error)
-          this.flushPendingIncomingUpdate()
        },
      })
  }
@@ -1379,25 +1249,27 @@ export class DocumentDetailComponent
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
      modal.componentInstance.buttonsEnabled = false
-      this.documentsService.reprocessDocuments([this.document.id]).subscribe({
-        next: () => {
-          this.toastService.showInfo(
-            $localize`Reprocess operation for "${this.document.title}" will begin in the background.`
-          )
-          if (modal) {
-            modal.close()
-          }
-        },
-        error: (error) => {
-          if (modal) {
-            modal.componentInstance.buttonsEnabled = true
-          }
-          this.toastService.showError(
-            $localize`Error executing operation`,
-            error
-          )
-        },
-      })
+      this.documentsService
+        .bulkEdit([this.document.id], 'reprocess', {})
+        .subscribe({
+          next: () => {
+            this.toastService.showInfo(
+              $localize`Reprocess operation for "${this.document.title}" will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.`
+            )
+            if (modal) {
+              modal.close()
+            }
+          },
+          error: (error) => {
+            if (modal) {
+              modal.componentInstance.buttonsEnabled = true
+            }
+            this.toastService.showError(
+              $localize`Error executing operation`,
+              error
+            )
+          },
+        })
    })
  }

@@ -1754,23 +1626,20 @@ export class DocumentDetailComponent
      size: 'xl',
      scrollable: true,
    })
-    const sourceDocumentId = this.selectedVersionId ?? this.document.id
    modal.componentInstance.title = $localize`PDF Editor`
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.documentID = this.document.id
-    modal.componentInstance.versionID = sourceDocumentId
    modal.componentInstance.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
        modal.componentInstance.buttonsEnabled = false
        this.documentsService
-          .editPdfDocuments([sourceDocumentId], {
+          .bulkEdit([this.document.id], 'edit_pdf', {
            operations: modal.componentInstance.getOperations(),
            delete_original: modal.componentInstance.deleteOriginal,
            update_document:
              modal.componentInstance.editMode == PdfEditorEditMode.Update,
            include_metadata: modal.componentInstance.includeMetadata,
-            source_mode: BulkEditSourceMode.EXPLICIT_SELECTION,
          })
          .pipe(first(), takeUntil(this.unsubscribeNotifier))
          .subscribe({
@@ -1816,18 +1685,16 @@ export class DocumentDetailComponent
    modal.componentInstance.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        const sourceDocumentId = this.selectedVersionId ?? this.document.id
        const dialog =
          modal.componentInstance as PasswordRemovalConfirmDialogComponent
        dialog.buttonsEnabled = false
        this.networkActive = true
        this.documentsService
-          .removePasswordDocuments([sourceDocumentId], {
+          .bulkEdit([this.document.id], 'remove_password', {
            password: this.password,
            update_document: dialog.updateDocument,
            include_metadata: dialog.includeMetadata,
            delete_original: dialog.deleteOriginal,
-            source_mode: BulkEditSourceMode.EXPLICIT_SELECTION,
          })
          .pipe(first(), takeUntil(this.unsubscribeNotifier))
          .subscribe({
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
@@ -1,4 +1,3 @@
-import { DatePipe } from '@angular/common'
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import {
  HttpTestingController,
@@ -139,7 +138,6 @@ describe('BulkEditorComponent', () => {
          },
        },
        FilterPipe,
-        DatePipe,
        SettingsService,
        {
          provide: UserService,
@@ -300,7 +298,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -332,7 +330,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -423,7 +421,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -455,7 +453,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -521,7 +519,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -553,7 +551,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -619,7 +617,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -651,7 +649,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -717,7 +715,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -749,7 +747,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -851,14 +849,16 @@ describe('BulkEditorComponent', () => {
    expect(modal).not.toBeUndefined()
    modal.componentInstance.confirm()
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/delete/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.flush(true)
    expect(req.request.body).toEqual({
      documents: [3, 4],
+      method: 'delete',
+      parameters: {},
    })
    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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -868,7 +868,7 @@ describe('BulkEditorComponent', () => {
    fixture.detectChanges()
    component.applyDelete()
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/delete/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
  })

@@ -944,14 +944,16 @@ describe('BulkEditorComponent', () => {
    expect(modal).not.toBeUndefined()
    modal.componentInstance.confirm()
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/reprocess/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.flush(true)
    expect(req.request.body).toEqual({
      documents: [3, 4],
+      method: 'reprocess',
+      parameters: {},
    })
    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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -977,16 +979,16 @@ describe('BulkEditorComponent', () => {
    modal.componentInstance.rotate()
    modal.componentInstance.confirm()
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/rotate/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.flush(true)
    expect(req.request.body).toEqual({
      documents: [3, 4],
-      degrees: 90,
-      source_mode: 'latest_version',
+      method: 'rotate',
+      parameters: { degrees: 90 },
    })
    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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1019,15 +1021,16 @@ describe('BulkEditorComponent', () => {
    modal.componentInstance.metadataDocumentID = 3
    modal.componentInstance.confirm()
    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/merge/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.flush(true)
    expect(req.request.body).toEqual({
      documents: [3, 4],
-      metadata_document_id: 3,
+      method: 'merge',
+      parameters: { 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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1037,16 +1040,16 @@ describe('BulkEditorComponent', () => {
    modal.componentInstance.deleteOriginals = true
    modal.componentInstance.confirm()
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/merge/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.flush(true)
    expect(req.request.body).toEqual({
      documents: [3, 4],
-      metadata_document_id: 3,
-      delete_originals: true,
+      method: 'merge',
+      parameters: { metadata_document_id: 3, 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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1058,16 +1061,16 @@ describe('BulkEditorComponent', () => {
    modal.componentInstance.archiveFallback = true
    modal.componentInstance.confirm()
    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/merge/`
+      `${environment.apiBaseUrl}documents/bulk_edit/`
    )
    req.flush(true)
    expect(req.request.body).toEqual({
      documents: [3, 4],
-      metadata_document_id: 3,
-      archive_fallback: true,
+      method: 'merge',
+      parameters: { metadata_document_id: 3, 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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1153,7 +1156,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
@@ -1460,7 +1463,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`
    ) // list reload
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -12,11 +12,10 @@ import {
 } from '@ng-bootstrap/ng-bootstrap'
 import { saveAs } from 'file-saver'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { first, map, Observable, Subject, switchMap, takeUntil } from 'rxjs'
+import { first, map, Subject, switchMap, takeUntil } from 'rxjs'
 import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component'
 import { CustomField } from 'src/app/data/custom-field'
 import { MatchingModel } from 'src/app/data/matching-model'
-import { SelectionDataItem } from 'src/app/data/results'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { DocumentListViewService } from 'src/app/services/document-list-view.service'
@@ -30,9 +29,8 @@ import { CorrespondentService } from 'src/app/services/rest/correspondent.servic
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
 import {
-  DocumentBulkEditMethod,
  DocumentService,
-  MergeDocumentsRequest,
+  SelectionDataItem,
 } from 'src/app/services/rest/document.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle.service'
@@ -257,9 +255,9 @@ export class BulkEditorComponent
    this.unsubscribeNotifier.complete()
  }

-  private executeBulkEditMethod(
+  private executeBulkOperation(
    modal: NgbModalRef,
-    method: DocumentBulkEditMethod,
+    method: string,
    args: any,
    overrideDocumentIDs?: number[]
  ) {
@@ -274,55 +272,32 @@ export class BulkEditorComponent
      )
      .pipe(first())
      .subscribe({
-        next: () => this.handleOperationSuccess(modal),
-        error: (error) => this.handleOperationError(modal, error),
+        next: () => {
+          if (args['delete_originals']) {
+            this.list.selected.clear()
+          }
+          this.list.reload()
+          this.list.reduceSelectionToFilter()
+          this.list.selected.forEach((id) => {
+            this.openDocumentService.refreshDocument(id)
+          })
+          this.savedViewService.maybeRefreshDocumentCounts()
+          if (modal) {
+            modal.close()
+          }
+        },
+        error: (error) => {
+          if (modal) {
+            modal.componentInstance.buttonsEnabled = true
+          }
+          this.toastService.showError(
+            $localize`Error executing bulk operation`,
+            error
+          )
+        },
      })
  }

-  private executeDocumentAction(
-    modal: NgbModalRef,
-    request: Observable<any>,
-    options: { deleteOriginals?: boolean } = {}
-  ) {
-    if (modal) {
-      modal.componentInstance.buttonsEnabled = false
-    }
-    request.pipe(first()).subscribe({
-      next: () => {
-        this.handleOperationSuccess(modal, options.deleteOriginals ?? false)
-      },
-      error: (error) => this.handleOperationError(modal, error),
-    })
-  }
-
-  private handleOperationSuccess(
-    modal: NgbModalRef,
-    clearSelection: boolean = false
-  ) {
-    if (clearSelection) {
-      this.list.selected.clear()
-    }
-    this.list.reload()
-    this.list.reduceSelectionToFilter()
-    this.list.selected.forEach((id) => {
-      this.openDocumentService.refreshDocument(id)
-    })
-    this.savedViewService.maybeRefreshDocumentCounts()
-    if (modal) {
-      modal.close()
-    }
-  }
-
-  private handleOperationError(modal: NgbModalRef, error: any) {
-    if (modal) {
-      modal.componentInstance.buttonsEnabled = true
-    }
-    this.toastService.showError(
-      $localize`Error executing bulk operation`,
-      error
-    )
-  }
-
  private applySelectionData(
    items: SelectionDataItem[],
    selectionModel: FilterableDropdownSelectionModel
@@ -471,13 +446,13 @@ export class BulkEditorComponent
      modal.componentInstance.confirmClicked
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe(() => {
-          this.executeBulkEditMethod(modal, 'modify_tags', {
+          this.executeBulkOperation(modal, 'modify_tags', {
            add_tags: changedTags.itemsToAdd.map((t) => t.id),
            remove_tags: changedTags.itemsToRemove.map((t) => t.id),
          })
        })
    } else {
-      this.executeBulkEditMethod(null, 'modify_tags', {
+      this.executeBulkOperation(null, 'modify_tags', {
        add_tags: changedTags.itemsToAdd.map((t) => t.id),
        remove_tags: changedTags.itemsToRemove.map((t) => t.id),
      })
@@ -511,12 +486,12 @@ export class BulkEditorComponent
      modal.componentInstance.confirmClicked
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe(() => {
-          this.executeBulkEditMethod(modal, 'set_correspondent', {
+          this.executeBulkOperation(modal, 'set_correspondent', {
            correspondent: correspondent ? correspondent.id : null,
          })
        })
    } else {
-      this.executeBulkEditMethod(null, 'set_correspondent', {
+      this.executeBulkOperation(null, 'set_correspondent', {
        correspondent: correspondent ? correspondent.id : null,
      })
    }
@@ -549,12 +524,12 @@ export class BulkEditorComponent
      modal.componentInstance.confirmClicked
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe(() => {
-          this.executeBulkEditMethod(modal, 'set_document_type', {
+          this.executeBulkOperation(modal, 'set_document_type', {
            document_type: documentType ? documentType.id : null,
          })
        })
    } else {
-      this.executeBulkEditMethod(null, 'set_document_type', {
+      this.executeBulkOperation(null, 'set_document_type', {
        document_type: documentType ? documentType.id : null,
      })
    }
@@ -587,12 +562,12 @@ export class BulkEditorComponent
      modal.componentInstance.confirmClicked
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe(() => {
-          this.executeBulkEditMethod(modal, 'set_storage_path', {
+          this.executeBulkOperation(modal, 'set_storage_path', {
            storage_path: storagePath ? storagePath.id : null,
          })
        })
    } else {
-      this.executeBulkEditMethod(null, 'set_storage_path', {
+      this.executeBulkOperation(null, 'set_storage_path', {
        storage_path: storagePath ? storagePath.id : null,
      })
    }
@@ -649,7 +624,7 @@ export class BulkEditorComponent
      modal.componentInstance.confirmClicked
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe(() => {
-          this.executeBulkEditMethod(modal, 'modify_custom_fields', {
+          this.executeBulkOperation(modal, 'modify_custom_fields', {
            add_custom_fields: changedCustomFields.itemsToAdd.map((f) => f.id),
            remove_custom_fields: changedCustomFields.itemsToRemove.map(
              (f) => f.id
@@ -657,7 +632,7 @@ export class BulkEditorComponent
          })
        })
    } else {
-      this.executeBulkEditMethod(null, 'modify_custom_fields', {
+      this.executeBulkOperation(null, 'modify_custom_fields', {
        add_custom_fields: changedCustomFields.itemsToAdd.map((f) => f.id),
        remove_custom_fields: changedCustomFields.itemsToRemove.map(
          (f) => f.id
@@ -787,16 +762,10 @@ export class BulkEditorComponent
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe(() => {
          modal.componentInstance.buttonsEnabled = false
-          this.executeDocumentAction(
-            modal,
-            this.documentService.deleteDocuments(Array.from(this.list.selected))
-          )
+          this.executeBulkOperation(modal, 'delete', {})
        })
    } else {
-      this.executeDocumentAction(
-        null,
-        this.documentService.deleteDocuments(Array.from(this.list.selected))
-      )
+      this.executeBulkOperation(null, 'delete', {})
    }
  }

@@ -835,12 +804,7 @@ export class BulkEditorComponent
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
        modal.componentInstance.buttonsEnabled = false
-        this.executeDocumentAction(
-          modal,
-          this.documentService.reprocessDocuments(
-            Array.from(this.list.selected)
-          )
-        )
+        this.executeBulkOperation(modal, 'reprocess', {})
      })
  }

@@ -851,7 +815,7 @@ export class BulkEditorComponent
    modal.componentInstance.confirmClicked.subscribe(
      ({ permissions, merge }) => {
        modal.componentInstance.buttonsEnabled = false
-        this.executeBulkEditMethod(modal, 'set_permissions', {
+        this.executeBulkOperation(modal, 'set_permissions', {
          ...permissions,
          merge,
        })
@@ -866,7 +830,7 @@ export class BulkEditorComponent
    })
    const rotateDialog = modal.componentInstance as RotateConfirmDialogComponent
    rotateDialog.title = $localize`Rotate confirm`
-    rotateDialog.messageBold = $localize`This operation will add rotated versions of the ${this.list.selected.size} document(s).`
+    rotateDialog.messageBold = $localize`This operation will permanently rotate the original version of ${this.list.selected.size} document(s).`
    rotateDialog.btnClass = 'btn-danger'
    rotateDialog.btnCaption = $localize`Proceed`
    rotateDialog.documentID = Array.from(this.list.selected)[0]
@@ -874,13 +838,9 @@ export class BulkEditorComponent
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
        rotateDialog.buttonsEnabled = false
-        this.executeDocumentAction(
-          modal,
-          this.documentService.rotateDocuments(
-            Array.from(this.list.selected),
-            rotateDialog.degrees
-          )
-        )
+        this.executeBulkOperation(modal, 'rotate', {
+          degrees: rotateDialog.degrees,
+        })
      })
  }

@@ -896,22 +856,18 @@ export class BulkEditorComponent
    mergeDialog.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        const args: MergeDocumentsRequest = {}
+        const args = {}
        if (mergeDialog.metadataDocumentID > -1) {
-          args.metadata_document_id = mergeDialog.metadataDocumentID
+          args['metadata_document_id'] = mergeDialog.metadataDocumentID
        }
        if (mergeDialog.deleteOriginals) {
-          args.delete_originals = true
+          args['delete_originals'] = true
        }
        if (mergeDialog.archiveFallback) {
-          args.archive_fallback = true
+          args['archive_fallback'] = true
        }
        mergeDialog.buttonsEnabled = false
-        this.executeDocumentAction(
-          modal,
-          this.documentService.mergeDocuments(mergeDialog.documentIDs, args),
-          { deleteOriginals: !!args.delete_originals }
-        )
+        this.executeBulkOperation(modal, 'merge', args, mergeDialog.documentIDs)
        this.toastService.showInfo(
          $localize`Merged document will be queued for consumption.`
        )
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -104,9 +104,11 @@
        }
      }

-      @if (list.activeSavedViewId && activeSavedViewCanChange) {
-        <button ngbDropdownItem (click)="saveViewConfig()" [disabled]="!savedViewIsModified" i18n>Save "{{list.activeSavedViewTitle}}"</button>
-      }
+      <div *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.SavedView }">
+        @if (list.activeSavedViewId) {
+          <button ngbDropdownItem (click)="saveViewConfig()" [disabled]="!savedViewIsModified" i18n>Save "{{list.activeSavedViewTitle}}"</button>
+        }
+      </div>
      <button ngbDropdownItem (click)="saveViewConfigAs()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.SavedView }" i18n>Save as...</button>
      <a ngbDropdownItem routerLink="/savedviews" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.SavedView }" i18n>All saved views</a>
    </div>
--- a/src-ui/src/app/components/document-list/document-list.component.spec.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.spec.ts
@@ -168,10 +168,6 @@ describe('DocumentListComponent', () => {
    )
  })

-  it('should not allow changing a saved view when none is active', () => {
-    expect(component.activeSavedViewCanChange).toBeFalsy()
-  })
-
  it('should determine if filtered, support reset', () => {
    fixture.detectChanges()
    documentListService.setFilterRules([
@@ -303,19 +299,6 @@ describe('DocumentListComponent', () => {
    expect(setCountSpy).toHaveBeenCalledWith(expect.any(Object), 3)
  })

-  it('should reset active saved view when loading unknown view config', () => {
-    component['activeSavedView'] = { id: 1 } as SavedView
-    const activateSpy = jest.spyOn(documentListService, 'activateSavedView')
-    const reloadSpy = jest.spyOn(documentListService, 'reload')
-    jest.spyOn(savedViewService, 'getCached').mockReturnValue(of(null))
-
-    component.loadViewConfig(10)
-
-    expect(component['activeSavedView']).toBeNull()
-    expect(activateSpy).not.toHaveBeenCalled()
-    expect(reloadSpy).not.toHaveBeenCalled()
-  })
-
  it('should support 3 different display modes', () => {
    jest.spyOn(documentListService, 'documents', 'get').mockReturnValue(docs)
    fixture.detectChanges()
@@ -483,7 +466,7 @@ describe('DocumentListComponent', () => {
  })

  it('should handle error on view saving', () => {
-    const view: SavedView = {
+    component.list.activateSavedView({
      id: 10,
      name: 'Saved View 10',
      sort_field: 'added',
@@ -494,16 +477,7 @@ describe('DocumentListComponent', () => {
          value: '20',
        },
      ],
-    }
-    jest.spyOn(savedViewService, 'getCached').mockReturnValue(of(view))
-    const queryParams = { view: view.id.toString() }
-    jest
-      .spyOn(activatedRoute, 'queryParamMap', 'get')
-      .mockReturnValue(of(convertToParamMap(queryParams)))
-    activatedRoute.snapshot.queryParams = queryParams
-    router.routerState.snapshot.url = '/view/10/'
-    fixture.detectChanges()
-
+    })
    const toastErrorSpy = jest.spyOn(toastService, 'showError')
    jest
      .spyOn(savedViewService, 'patch')
@@ -515,40 +489,6 @@ describe('DocumentListComponent', () => {
    )
  })

-  it('should not save a view without object change permissions', () => {
-    const view: SavedView = {
-      id: 10,
-      name: 'Saved View 10',
-      sort_field: 'added',
-      sort_reverse: true,
-      filter_rules: [
-        {
-          rule_type: FILTER_HAS_TAGS_ANY,
-          value: '20',
-        },
-      ],
-      owner: 999,
-      user_can_change: false,
-    }
-    jest.spyOn(savedViewService, 'getCached').mockReturnValue(of(view))
-    jest
-      .spyOn(permissionService, 'currentUserHasObjectPermissions')
-      .mockReturnValue(false)
-    const queryParams = { view: view.id.toString() }
-    jest
-      .spyOn(activatedRoute, 'queryParamMap', 'get')
-      .mockReturnValue(of(convertToParamMap(queryParams)))
-    activatedRoute.snapshot.queryParams = queryParams
-    router.routerState.snapshot.url = '/view/10/'
-    fixture.detectChanges()
-
-    const patchSpy = jest.spyOn(savedViewService, 'patch')
-
-    component.saveViewConfig()
-
-    expect(patchSpy).not.toHaveBeenCalled()
-  })
-
  it('should support edited view saving as', () => {
    const view: SavedView = {
      id: 10,
@@ -580,107 +520,21 @@ describe('DocumentListComponent', () => {
    const modalSpy = jest.spyOn(modalService, 'open')
    const toastSpy = jest.spyOn(toastService, 'showInfo')
    const savedViewServiceCreate = jest.spyOn(savedViewService, 'create')
-    jest
-      .spyOn(savedViewService, 'dashboardViews', 'get')
-      .mockReturnValue([{ id: 77 } as SavedView])
-    jest
-      .spyOn(savedViewService, 'sidebarViews', 'get')
-      .mockReturnValue([{ id: 88 } as SavedView])
-    const updateVisibilitySpy = jest
-      .spyOn(settingsService, 'updateSavedViewsVisibility')
-      .mockReturnValue(of({ success: true }))
    savedViewServiceCreate.mockReturnValueOnce(of(modifiedView))
    component.saveViewConfigAs()

    const modalCloseSpy = jest.spyOn(openModal, 'close')
-    const permissions = {
-      owner: 5,
-      set_permissions: {
-        view: {
-          users: [4],
-          groups: [3],
-        },
-        change: {
-          users: [2],
-          groups: [1],
-        },
-      },
-    }
    openModal.componentInstance.saveClicked.next({
      name: 'Foo Bar',
-      showOnDashboard: true,
-      showInSideBar: true,
-      permissions_form: permissions,
+      show_on_dashboard: true,
+      show_in_sidebar: true,
    })
    expect(savedViewServiceCreate).toHaveBeenCalled()
-    expect(savedViewServiceCreate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        name: 'Foo Bar',
-        owner: permissions.owner,
-        set_permissions: permissions.set_permissions,
-      })
-    )
-    expect(updateVisibilitySpy).toHaveBeenCalledWith(
-      expect.arrayContaining([77, modifiedView.id]),
-      expect.arrayContaining([88, modifiedView.id])
-    )
    expect(modalSpy).toHaveBeenCalled()
    expect(toastSpy).toHaveBeenCalled()
    expect(modalCloseSpy).toHaveBeenCalled()
  })

-  it('should show error when visibility update fails after creating a view', () => {
-    const view: SavedView = {
-      id: 10,
-      name: 'Saved View 10',
-      sort_field: 'added',
-      sort_reverse: true,
-      filter_rules: [
-        {
-          rule_type: FILTER_HAS_TAGS_ANY,
-          value: '20',
-        },
-      ],
-    }
-    jest.spyOn(savedViewService, 'getCached').mockReturnValue(of(view))
-    const queryParams = { view: view.id.toString() }
-    jest
-      .spyOn(activatedRoute, 'queryParamMap', 'get')
-      .mockReturnValue(of(convertToParamMap(queryParams)))
-    activatedRoute.snapshot.queryParams = queryParams
-    router.routerState.snapshot.url = '/view/10/'
-    fixture.detectChanges()
-
-    let openModal: NgbModalRef
-    modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
-    jest
-      .spyOn(savedViewService, 'create')
-      .mockReturnValueOnce(of({ ...view, id: 42, name: 'Foo Bar' }))
-    jest.spyOn(savedViewService, 'dashboardViews', 'get').mockReturnValue([])
-    jest.spyOn(savedViewService, 'sidebarViews', 'get').mockReturnValue([])
-    jest
-      .spyOn(settingsService, 'updateSavedViewsVisibility')
-      .mockReturnValueOnce(
-        throwError(() => new Error('unable to save visibility settings'))
-      )
-    const toastErrorSpy = jest.spyOn(toastService, 'showError')
-
-    component.saveViewConfigAs()
-
-    const modalCloseSpy = jest.spyOn(openModal, 'close')
-    openModal.componentInstance.saveClicked.next({
-      name: 'Foo Bar',
-      showOnDashboard: true,
-      showInSideBar: false,
-    })
-
-    expect(modalCloseSpy).toHaveBeenCalled()
-    expect(toastErrorSpy).toHaveBeenCalledWith(
-      'View "Foo Bar" created successfully, but could not update visibility settings.',
-      expect.any(Error)
-    )
-  })
-
  it('should handle error on edited view saving as', () => {
    const view: SavedView = {
      id: 10,
@@ -709,10 +563,6 @@ describe('DocumentListComponent', () => {

    let openModal: NgbModalRef
    modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
-    const updateVisibilitySpy = jest.spyOn(
-      settingsService,
-      'updateSavedViewsVisibility'
-    )
    jest.spyOn(savedViewService, 'create').mockReturnValueOnce(
      throwError(
        () =>
@@ -725,10 +575,9 @@ describe('DocumentListComponent', () => {

    openModal.componentInstance.saveClicked.next({
      name: 'Foo Bar',
-      showOnDashboard: true,
-      showInSideBar: true,
+      show_on_dashboard: true,
+      show_in_sidebar: true,
    })
-    expect(updateVisibilitySpy).not.toHaveBeenCalled()
    expect(openModal.componentInstance.error).toEqual({ filter_rules: ['11'] })
  })

--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -47,10 +47,7 @@ import { UsernamePipe } from 'src/app/pipes/username.pipe'
 import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 import { HotKeyService } from 'src/app/services/hot-key.service'
 import { OpenDocumentsService } from 'src/app/services/open-documents.service'
-import {
-  PermissionAction,
-  PermissionsService,
-} from 'src/app/services/permissions.service'
+import { PermissionsService } from 'src/app/services/permissions.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -151,18 +148,12 @@ export class DocumentListComponent

  unmodifiedFilterRules: FilterRule[] = []
  private unmodifiedSavedView: SavedView
-  private activeSavedView: SavedView | null = null

  private unsubscribeNotifier: Subject<any> = new Subject()

  get savedViewIsModified(): boolean {
-    if (
-      !this.list.activeSavedViewId ||
-      !this.unmodifiedSavedView ||
-      !this.activeSavedViewCanChange
-    ) {
-      return false
-    } else {
+    if (!this.list.activeSavedViewId || !this.unmodifiedSavedView) return false
+    else {
      return (
        this.unmodifiedSavedView.sort_field !== this.list.sortField ||
        this.unmodifiedSavedView.sort_reverse !== this.list.sortReverse ||
@@ -189,16 +180,6 @@ export class DocumentListComponent
    }
  }

-  get activeSavedViewCanChange(): boolean {
-    if (!this.activeSavedView) {
-      return false
-    }
-    return this.permissionService.currentUserHasObjectPermissions(
-      PermissionAction.Change,
-      this.activeSavedView
-    )
-  }
-
  get isFiltered() {
    return !!this.filterEditor?.rulesModified
  }
@@ -283,13 +264,11 @@ export class DocumentListComponent
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(({ view }) => {
        if (!view) {
-          this.activeSavedView = null
          this.router.navigate(['404'], {
            replaceUrl: true,
          })
          return
        }
-        this.activeSavedView = view
        this.unmodifiedSavedView = view
        this.list.activateSavedViewWithQueryParams(
          view,
@@ -313,7 +292,6 @@ export class DocumentListComponent
          // loading a saved view on /documents
          this.loadViewConfig(parseInt(queryParams.get('view')))
        } else {
-          this.activeSavedView = null
          this.list.activateSavedView(null)
          this.list.loadFromQueryParams(queryParams)
          this.unmodifiedFilterRules = []
@@ -396,7 +374,7 @@ export class DocumentListComponent
  }

  saveViewConfig() {
-    if (this.list.activeSavedViewId != null && this.activeSavedViewCanChange) {
+    if (this.list.activeSavedViewId != null) {
      let savedView: SavedView = {
        id: this.list.activeSavedViewId,
        filter_rules: this.list.filterRules,
@@ -410,7 +388,6 @@ export class DocumentListComponent
        .pipe(first())
        .subscribe({
          next: (view) => {
-            this.activeSavedView = view
            this.unmodifiedSavedView = view
            this.toastService.showInfo(
              $localize`View "${this.list.activeSavedViewTitle}" saved successfully.`
@@ -432,11 +409,6 @@ export class DocumentListComponent
      .getCached(viewID)
      .pipe(first())
      .subscribe((view) => {
-        if (!view) {
-          this.activeSavedView = null
-          return
-        }
-        this.activeSavedView = view
        this.unmodifiedSavedView = view
        this.list.activateSavedView(view)
        this.list.reload(() => {
@@ -454,48 +426,24 @@ export class DocumentListComponent
      modal.componentInstance.buttonsEnabled = false
      let savedView: SavedView = {
        name: formValue.name,
+        show_on_dashboard: formValue.showOnDashboard,
+        show_in_sidebar: formValue.showInSideBar,
        filter_rules: this.list.filterRules,
        sort_reverse: this.list.sortReverse,
        sort_field: this.list.sortField,
        display_mode: this.list.displayMode,
        display_fields: this.activeDisplayFields,
      }
-      const permissions = formValue.permissions_form
-      if (permissions) {
-        if (permissions.owner !== null && permissions.owner !== undefined) {
-          savedView.owner = permissions.owner
-        }
-        if (permissions.set_permissions) {
-          savedView['set_permissions'] = permissions.set_permissions
-        }
-      }

      this.savedViewService
        .create(savedView)
        .pipe(first())
        .subscribe({
-          next: (createdView) => {
-            this.saveCreatedViewVisibility(
-              createdView,
-              formValue.showOnDashboard,
-              formValue.showInSideBar
+          next: () => {
+            modal.close()
+            this.toastService.showInfo(
+              $localize`View "${savedView.name}" created successfully.`
            )
-              .pipe(first())
-              .subscribe({
-                next: () => {
-                  modal.close()
-                  this.toastService.showInfo(
-                    $localize`View "${savedView.name}" created successfully.`
-                  )
-                },
-                error: (error) => {
-                  modal.close()
-                  this.toastService.showError(
-                    $localize`View "${savedView.name}" created successfully, but could not update visibility settings.`,
-                    error
-                  )
-                },
-              })
          },
          error: (httpError) => {
            let error = httpError.error
@@ -509,28 +457,6 @@ export class DocumentListComponent
    })
  }

-  private saveCreatedViewVisibility(
-    createdView: SavedView,
-    showOnDashboard: boolean,
-    showInSideBar: boolean
-  ) {
-    const dashboardViewIds = this.savedViewService.dashboardViews.map(
-      (v) => v.id
-    )
-    const sidebarViewIds = this.savedViewService.sidebarViews.map((v) => v.id)
-    if (showOnDashboard) {
-      dashboardViewIds.push(createdView.id)
-    }
-    if (showInSideBar) {
-      sidebarViewIds.push(createdView.id)
-    }
-
-    return this.settingsService.updateSavedViewsVisibility(
-      dashboardViewIds,
-      sidebarViewIds
-    )
-  }
-
  openDocumentDetail(document: Document | number) {
    this.router.navigate([
      'documents',
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -76,7 +76,6 @@ import {
  FILTER_TITLE_CONTENT,
  NEGATIVE_NULL_FILTER_VALUE,
 } from 'src/app/data/filter-rule-type'
-import { SelectionData, SelectionDataItem } from 'src/app/data/results'
 import {
  PermissionAction,
  PermissionType,
@@ -85,7 +84,11 @@ import {
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
-import { DocumentService } from 'src/app/services/rest/document.service'
+import {
+  DocumentService,
+  SelectionData,
+  SelectionDataItem,
+} from 'src/app/services/rest/document.service'
 import { SearchService } from 'src/app/services/rest/search.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { TagService } from 'src/app/services/rest/tag.service'
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html
@@ -8,7 +8,6 @@
    <pngx-input-text i18n-title title="Name" formControlName="name" [error]="error?.name" autocomplete="off"></pngx-input-text>
    <pngx-input-check i18n-title title="Show in sidebar" formControlName="showInSideBar"></pngx-input-check>
    <pngx-input-check i18n-title title="Show on dashboard" formControlName="showOnDashboard"></pngx-input-check>
-    <pngx-permissions-form accordion="true" formControlName="permissions_form"></pngx-permissions-form>
    @if (error?.filter_rules) {
      <div class="alert alert-danger" role="alert">
        <h6 class="alert-heading" i18n>Filter rules error occurred while saving this view</h6>
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.spec.ts
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.spec.ts
@@ -7,13 +7,7 @@ import {
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { By } from '@angular/platform-browser'
 import { NgbActiveModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'
-import { of } from 'rxjs'
-import { GroupService } from 'src/app/services/rest/group.service'
-import { UserService } from 'src/app/services/rest/user.service'
 import { CheckComponent } from '../../common/input/check/check.component'
-import { PermissionsFormComponent } from '../../common/input/permissions/permissions-form/permissions-form.component'
-import { PermissionsGroupComponent } from '../../common/input/permissions/permissions-group/permissions-group.component'
-import { PermissionsUserComponent } from '../../common/input/permissions/permissions-user/permissions-user.component'
 import { TextComponent } from '../../common/input/text/text.component'
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog.component'

@@ -24,21 +18,7 @@ describe('SaveViewConfigDialogComponent', () => {

  beforeEach(fakeAsync(() => {
    TestBed.configureTestingModule({
-      providers: [
-        NgbActiveModal,
-        {
-          provide: UserService,
-          useValue: {
-            listAll: () => of({ results: [] }),
-          },
-        },
-        {
-          provide: GroupService,
-          useValue: {
-            listAll: () => of({ results: [] }),
-          },
-        },
-      ],
+      providers: [NgbActiveModal],
      imports: [
        NgbModalModule,
        FormsModule,
@@ -46,9 +26,6 @@ describe('SaveViewConfigDialogComponent', () => {
        SaveViewConfigDialogComponent,
        TextComponent,
        CheckComponent,
-        PermissionsFormComponent,
-        PermissionsUserComponent,
-        PermissionsGroupComponent,
      ],
    }).compileComponents()

@@ -104,26 +81,6 @@ describe('SaveViewConfigDialogComponent', () => {
    })
  })

-  it('should support permissions input', () => {
-    const permissions = {
-      owner: 10,
-      set_permissions: {
-        view: { users: [2], groups: [3] },
-        change: { users: [4], groups: [5] },
-      },
-    }
-    let result
-    component.saveClicked.subscribe((saveResult) => (result = saveResult))
-    component.saveViewConfigForm.get('permissions_form').patchValue(permissions)
-    component.save()
-    expect(result).toEqual({
-      name: '',
-      showInSideBar: false,
-      showOnDashboard: false,
-      permissions_form: permissions,
-    })
-  })
-
  it('should support default name', () => {
    const saveClickedSpy = jest.spyOn(component.saveClicked, 'emit')
    const modalCloseSpy = jest.spyOn(modal, 'close')
--- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
+++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts
@@ -13,22 +13,14 @@ import {
  ReactiveFormsModule,
 } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { User } from 'src/app/data/user'
 import { CheckComponent } from '../../common/input/check/check.component'
-import { PermissionsFormComponent } from '../../common/input/permissions/permissions-form/permissions-form.component'
 import { TextComponent } from '../../common/input/text/text.component'

@Component({
  selector: 'pngx-save-view-config-dialog',
  templateUrl: './save-view-config-dialog.component.html',
  styleUrls: ['./save-view-config-dialog.component.scss'],
-  imports: [
-    CheckComponent,
-    TextComponent,
-    PermissionsFormComponent,
-    FormsModule,
-    ReactiveFormsModule,
-  ],
+  imports: [CheckComponent, TextComponent, FormsModule, ReactiveFormsModule],
 })
 export class SaveViewConfigDialogComponent implements OnInit {
  private modal = inject(NgbActiveModal)
@@ -44,8 +36,6 @@ export class SaveViewConfigDialogComponent implements OnInit {

  closeEnabled = false

-  users: User[]
-
  _defaultName = ''

  get defaultName() {
@@ -62,7 +52,6 @@ export class SaveViewConfigDialogComponent implements OnInit {
    name: new FormControl(''),
    showInSideBar: new FormControl(false),
    showOnDashboard: new FormControl(false),
-    permissions_form: new FormControl(null),
  })

  ngOnInit(): void {
@@ -73,16 +62,7 @@ export class SaveViewConfigDialogComponent implements OnInit {
  }

  save() {
-    const formValue = this.saveViewConfigForm.value
-    const saveViewConfig = {
-      name: formValue.name,
-      showInSideBar: formValue.showInSideBar,
-      showOnDashboard: formValue.showOnDashboard,
-    }
-    if (formValue.permissions_form) {
-      saveViewConfig['permissions_form'] = formValue.permissions_form
-    }
-    this.saveClicked.emit(saveViewConfig)
+    this.saveClicked.emit(this.saveViewConfigForm.value)
  }

  cancel() {
--- a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html
+++ b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html
@@ -9,8 +9,8 @@
    <div ngbDropdown class="btn-group flex-fill d-sm-none">
      <button class="btn btn-sm btn-outline-primary" id="dropdownSelectMobile" ngbDropdownToggle>
        <i-bs name="text-indent-left"></i-bs><div class="d-none d-sm-inline ms-1"><ng-container i18n>Select</ng-container></div>
-        @if (activeManagementList.hasSelection) {
-          <pngx-clearable-badge [selected]="activeManagementList.hasSelection" [number]="activeManagementList.selectedCount" (cleared)="activeManagementList.selectNone()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
+        @if (activeManagementList.selectedObjects.size > 0) {
+          <pngx-clearable-badge [selected]="activeManagementList.selectedObjects.size > 0" [number]="activeManagementList.selectedObjects.size" (cleared)="activeManagementList.selectNone()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
        }
      </button>
      <div ngbDropdownMenu aria-labelledby="dropdownSelectMobile" class="shadow">
@@ -25,7 +25,7 @@
        <span class="input-group-text border-0" i18n>Select:</span>
      </div>
      <div class="btn-group btn-group-sm flex-nowrap">
-        @if (activeManagementList.hasSelection) {
+        @if (activeManagementList.selectedObjects.size > 0) {
          <button class="btn btn-sm btn-outline-secondary" (click)="activeManagementList.selectNone()">
            <i-bs name="slash-circle" class="me-1"></i-bs><ng-container i18n>None</ng-container>
          </button>
@@ -40,11 +40,11 @@
    </div>

    <button type="button" class="btn btn-sm btn-outline-primary" (click)="activeManagementList.setPermissions()"
-      [disabled]="!activeManagementList.userCanBulkEdit(PermissionAction.Change) || !activeManagementList.hasSelection">
+      [disabled]="!activeManagementList.userCanBulkEdit(PermissionAction.Change) || activeManagementList.selectedObjects.size === 0">
      <i-bs name="person-fill-lock" class="me-1"></i-bs><ng-container i18n>Permissions</ng-container>
    </button>
    <button type="button" class="btn btn-sm btn-outline-danger" (click)="activeManagementList.delete()"
-      [disabled]="!activeManagementList.userCanBulkEdit(PermissionAction.Delete) || !activeManagementList.hasSelection">
+      [disabled]="!activeManagementList.userCanBulkEdit(PermissionAction.Delete) || activeManagementList.selectedObjects.size === 0">
      <i-bs name="trash" class="me-1"></i-bs><ng-container i18n>Delete</ng-container>
    </button>
    <button type="button" class="btn btn-sm btn-outline-primary ms-md-5" (click)="activeManagementList.openCreateDialog()"
--- a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.html
+++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.html
@@ -65,8 +65,8 @@
    @if (displayCollectionSize > 0) {
      <div>
        <ng-container i18n>{displayCollectionSize, plural, =1 {One {{typeName}}} other {{{displayCollectionSize || 0}} total {{typeNamePlural}}}}</ng-container>
-        @if (hasSelection) {
-          &nbsp;({{selectedCount}} selected)
+        @if (selectedObjects.size > 0) {
+          &nbsp;({{selectedObjects.size}} selected)
        }
      </div>
    }
--- a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts
+++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts
@@ -117,6 +117,7 @@ describe('ManagementListComponent', () => {
            : tags
          return of({
            count: results.length,
+            all: results.map((o) => o.id),
            results,
          })
        }
@@ -230,11 +231,11 @@ describe('ManagementListComponent', () => {
    expect(reloadSpy).toHaveBeenCalled()
  })

-  it('should use API count for pagination and nested ids for displayed total', fakeAsync(() => {
+  it('should use API count for pagination and all ids for displayed total', fakeAsync(() => {
    jest.spyOn(tagService, 'listFiltered').mockReturnValueOnce(
      of({
        count: 1,
-        display_count: 3,
+        all: [1, 2, 3],
        results: tags.slice(0, 1),
      })
    )
@@ -314,17 +315,13 @@ describe('ManagementListComponent', () => {
    expect(component.togggleAll).toBe(false)
  })

-  it('selectAll should activate all-selection mode', () => {
-    ;(tagService.listFiltered as jest.Mock).mockClear()
-    component.collectionSize = tags.length
+  it('selectAll should use all IDs when collection size exists', () => {
+    ;(component as any).allIDs = [1, 2, 3, 4]
+    component.collectionSize = 4

    component.selectAll()

-    expect(tagService.listFiltered).not.toHaveBeenCalled()
-    expect(component.selectedObjects).toEqual(new Set(tags.map((t) => t.id)))
-    expect((component as any).allSelectionActive).toBe(true)
-    expect(component.hasSelection).toBe(true)
-    expect(component.selectedCount).toBe(tags.length)
+    expect(component.selectedObjects).toEqual(new Set([1, 2, 3, 4]))
    expect(component.togggleAll).toBe(true)
  })

@@ -398,33 +395,6 @@ describe('ManagementListComponent', () => {
    expect(successToastSpy).toHaveBeenCalled()
  })

-  it('should support bulk edit permissions for all filtered items', () => {
-    const bulkEditPermsSpy = jest
-      .spyOn(tagService, 'bulk_edit_objects')
-      .mockReturnValue(of('OK'))
-    component.selectAll()
-
-    let modal: NgbModalRef
-    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
-    fixture.detectChanges()
-    component.setPermissions()
-    expect(modal).not.toBeUndefined()
-
-    modal.componentInstance.confirmClicked.emit({
-      permissions: {},
-      merge: true,
-    })
-
-    expect(bulkEditPermsSpy).toHaveBeenCalledWith(
-      [],
-      BulkEditObjectOperation.SetPermissions,
-      {},
-      true,
-      true,
-      { is_root: true }
-    )
-  })
-
  it('should support bulk delete objects', () => {
    const bulkEditSpy = jest.spyOn(tagService, 'bulk_edit_objects')
    component.toggleSelected(tags[0])
@@ -445,11 +415,7 @@ describe('ManagementListComponent', () => {
    modal.componentInstance.confirmClicked.emit(null)
    expect(bulkEditSpy).toHaveBeenCalledWith(
      Array.from(selected),
-      BulkEditObjectOperation.Delete,
-      null,
-      null,
-      false,
-      null
+      BulkEditObjectOperation.Delete
    )
    expect(errorToastSpy).toHaveBeenCalled()

@@ -460,29 +426,6 @@ describe('ManagementListComponent', () => {
    expect(successToastSpy).toHaveBeenCalled()
  })

-  it('should support bulk delete for all filtered items', () => {
-    const bulkEditSpy = jest
-      .spyOn(tagService, 'bulk_edit_objects')
-      .mockReturnValue(of('OK'))
-
-    component.selectAll()
-    let modal: NgbModalRef
-    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
-    fixture.detectChanges()
-    component.delete()
-    expect(modal).not.toBeUndefined()
-
-    modal.componentInstance.confirmClicked.emit(null)
-    expect(bulkEditSpy).toHaveBeenCalledWith(
-      [],
-      BulkEditObjectOperation.Delete,
-      null,
-      null,
-      true,
-      { is_root: true }
-    )
-  })
-
  it('should disallow bulk permissions or delete objects if no global perms', () => {
    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(false)
    expect(component.userCanBulkEdit(PermissionAction.Delete)).toBeFalsy()
--- a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts
+++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts
@@ -90,8 +90,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>

  public data: T[] = []
  private unfilteredData: T[] = []
-  private currentExtraParams: { [key: string]: any } = null
-  private allSelectionActive = false
+  private allIDs: number[] = []

  public page = 1

@@ -108,16 +107,6 @@ export abstract class ManagementListComponent<T extends MatchingModel>
  public selectedObjects: Set<number> = new Set()
  public togggleAll: boolean = false

-  public get hasSelection(): boolean {
-    return this.selectedObjects.size > 0 || this.allSelectionActive
-  }
-
-  public get selectedCount(): number {
-    return this.allSelectionActive
-      ? this.displayCollectionSize
-      : this.selectedObjects.size
-  }
-
  ngOnInit(): void {
    this.reloadData()

@@ -161,11 +150,11 @@ export abstract class ManagementListComponent<T extends MatchingModel>
  }

  protected getCollectionSize(results: Results<T>): number {
-    return results.count
+    return results.all?.length ?? results.count
  }

  protected getDisplayCollectionSize(results: Results<T>): number {
-    return results.display_count ?? this.getCollectionSize(results)
+    return this.getCollectionSize(results)
  }

  getDocumentCount(object: MatchingModel): number {
@@ -182,7 +171,6 @@ export abstract class ManagementListComponent<T extends MatchingModel>

  reloadData(extraParams: { [key: string]: any } = null) {
    this.loading = true
-    this.currentExtraParams = extraParams
    this.clearSelection()
    this.service
      .listFiltered(
@@ -201,6 +189,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
          this.data = this.filterData(c.results)
          this.collectionSize = this.getCollectionSize(c)
          this.displayCollectionSize = this.getDisplayCollectionSize(c)
+          this.allIDs = c.all
        }),
        delay(100)
      )
@@ -357,16 +346,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
    return objects.map((o) => o.id)
  }

-  private getBulkEditFilters(): { [key: string]: any } {
-    const filters = { ...this.currentExtraParams }
-    if (this._nameFilter?.length) {
-      filters['name__icontains'] = this._nameFilter
-    }
-    return filters
-  }
-
  clearSelection() {
-    this.allSelectionActive = false
    this.togggleAll = false
    this.selectedObjects.clear()
  }
@@ -376,7 +356,6 @@ export abstract class ManagementListComponent<T extends MatchingModel>
  }

  selectPage() {
-    this.allSelectionActive = false
    this.selectedObjects = new Set(this.getSelectableIDs(this.data))
    this.togggleAll = this.areAllPageItemsSelected()
  }
@@ -386,16 +365,11 @@ export abstract class ManagementListComponent<T extends MatchingModel>
      this.clearSelection()
      return
    }
-
-    this.allSelectionActive = true
-    this.selectedObjects = new Set(this.getSelectableIDs(this.data))
+    this.selectedObjects = new Set(this.allIDs)
    this.togggleAll = this.areAllPageItemsSelected()
  }

  toggleSelected(object) {
-    if (this.allSelectionActive) {
-      this.allSelectionActive = false
-    }
    this.selectedObjects.has(object.id)
      ? this.selectedObjects.delete(object.id)
      : this.selectedObjects.add(object.id)
@@ -403,9 +377,6 @@ export abstract class ManagementListComponent<T extends MatchingModel>
  }

  protected areAllPageItemsSelected(): boolean {
-    if (this.allSelectionActive) {
-      return this.data.length > 0
-    }
    const ids = this.getSelectableIDs(this.data)
    return ids.length > 0 && ids.every((id) => this.selectedObjects.has(id))
  }
@@ -419,12 +390,10 @@ export abstract class ManagementListComponent<T extends MatchingModel>
        modal.componentInstance.buttonsEnabled = false
        this.service
          .bulk_edit_objects(
-            this.allSelectionActive ? [] : Array.from(this.selectedObjects),
+            Array.from(this.selectedObjects),
            BulkEditObjectOperation.SetPermissions,
            permissions,
-            merge,
-            this.allSelectionActive,
-            this.allSelectionActive ? this.getBulkEditFilters() : null
+            merge
          )
          .subscribe({
            next: () => {
@@ -459,12 +428,8 @@ export abstract class ManagementListComponent<T extends MatchingModel>
      modal.componentInstance.buttonsEnabled = false
      this.service
        .bulk_edit_objects(
-          this.allSelectionActive ? [] : Array.from(this.selectedObjects),
-          BulkEditObjectOperation.Delete,
-          null,
-          null,
-          this.allSelectionActive,
-          this.allSelectionActive ? this.getBulkEditFilters() : null
+          Array.from(this.selectedObjects),
+          BulkEditObjectOperation.Delete
        )
        .subscribe({
          next: () => {
--- a/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts
+++ b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts
@@ -41,6 +41,7 @@ describe('TagListComponent', () => {
    listFilteredSpy = jest.spyOn(tagService, 'listFiltered').mockReturnValue(
      of({
        count: 3,
+        all: [1, 2, 3],
        results: [
          {
            id: 1,
--- a/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts
@@ -9,6 +9,7 @@ import {
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { TagEditDialogComponent } from 'src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component'
 import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type'
+import { Results } from 'src/app/data/results'
 import { Tag } from 'src/app/data/tag'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { SortableDirective } from 'src/app/directives/sortable.directive'
@@ -76,6 +77,16 @@ export class TagListComponent extends ManagementListComponent<Tag> {
    return data.filter((tag) => !tag.parent || !availableIds.has(tag.parent))
  }

+  protected override getCollectionSize(results: Results<Tag>): number {
+    // Tag list pages are requested with is_root=true (when unfiltered), so
+    // pagination must follow root count even though `all` includes descendants
+    return results.count
+  }
+
+  protected override getDisplayCollectionSize(results: Results<Tag>): number {
+    return super.getCollectionSize(results)
+  }
+
  protected override getSelectableIDs(tags: Tag[]): number[] {
    const ids: number[] = []
    for (const tag of tags.filter(Boolean)) {
--- a/src-ui/src/app/components/manage/saved-views/saved-views.component.html
+++ b/src-ui/src/app/components/manage/saved-views/saved-views.component.html
@@ -25,23 +25,15 @@
            </div>
          </div>
          <div class="col-auto">
-            @if (canDeleteSavedView(view)) {
-              <label class="form-label" for="name_{{view.id}}" i18n>Actions</label>
-              <button
-                class="btn btn-sm btn-outline-secondary form-control mb-2"
-                type="button"
-                (click)="editPermissions(view)"
-                *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.SavedView }"
-                i18n><i-bs class="me-1" name="person-fill-lock"></i-bs>Permissions</button>
-              <pngx-confirm-button
-                label="Delete"
-                i18n-label
-                (confirm)="deleteSavedView(view)"
-                *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.SavedView }"
-                buttonClasses="btn-sm btn-outline-danger form-control"
-                iconName="trash">
-              </pngx-confirm-button>
-            }
+            <label class="form-label" for="name_{{view.id}}" i18n>Actions</label>
+            <pngx-confirm-button
+              label="Delete"
+              i18n-label
+              (confirm)="deleteSavedView(view)"
+              *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.SavedView }"
+              buttonClasses="btn-sm btn-outline-danger form-control"
+              iconName="trash">
+            </pngx-confirm-button>
          </div>
        </div>
        <div class="row">
--- a/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts
+++ b/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts
@@ -3,16 +3,16 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'
+import { By } from '@angular/platform-browser'
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { Subject, of, throwError } from 'rxjs'
+import { of, throwError } from 'rxjs'
 import { SavedView } from 'src/app/data/saved-view'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { PermissionsService } from 'src/app/services/permissions.service'
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
-import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { ConfirmButtonComponent } from '../../common/confirm-button/confirm-button.component'
 import { CheckComponent } from '../../common/input/check/check.component'
@@ -32,9 +32,7 @@ describe('SavedViewsComponent', () => {
  let component: SavedViewsComponent
  let fixture: ComponentFixture<SavedViewsComponent>
  let savedViewService: SavedViewService
-  let settingsService: SettingsService
  let toastService: ToastService
-  let modalService: NgbModal

  beforeEach(async () => {
    TestBed.configureTestingModule({
@@ -59,8 +57,6 @@ describe('SavedViewsComponent', () => {
          provide: PermissionsService,
          useValue: {
            currentUserCan: () => true,
-            currentUserHasObjectPermissions: () => true,
-            currentUserOwnsObject: () => true,
          },
        },
        {
@@ -81,13 +77,11 @@ describe('SavedViewsComponent', () => {
    }).compileComponents()

    savedViewService = TestBed.inject(SavedViewService)
-    settingsService = TestBed.inject(SettingsService)
    toastService = TestBed.inject(ToastService)
-    modalService = TestBed.inject(NgbModal)
    fixture = TestBed.createComponent(SavedViewsComponent)
    component = fixture.componentInstance

-    jest.spyOn(savedViewService, 'list').mockReturnValue(
+    jest.spyOn(savedViewService, 'listAll').mockReturnValue(
      of({
        all: savedViews.map((v) => v.id),
        count: savedViews.length,
@@ -100,13 +94,14 @@ describe('SavedViewsComponent', () => {

  it('should support save saved views, show error', () => {
    const toastErrorSpy = jest.spyOn(toastService, 'showError')
+    const toastSpy = jest.spyOn(toastService, 'show')
    const savedViewPatchSpy = jest.spyOn(savedViewService, 'patchMany')
-    const control = component.savedViewsForm
-      .get('savedViews')
-      .get(savedViews[0].id.toString())
-      .get('name')
-    control.setValue(`${savedViews[0].name}-changed`)
-    control.markAsDirty()
+
+    const toggle = fixture.debugElement.query(
+      By.css('.form-check.form-switch input')
+    )
+    toggle.nativeElement.checked = true
+    toggle.nativeElement.dispatchEvent(new Event('change'))

    // saved views error first
    savedViewPatchSpy.mockReturnValueOnce(
@@ -115,13 +110,12 @@ describe('SavedViewsComponent', () => {
    component.save()
    expect(toastErrorSpy).toHaveBeenCalled()
    expect(savedViewPatchSpy).toHaveBeenCalled()
+    toastSpy.mockClear()
    toastErrorSpy.mockClear()
    savedViewPatchSpy.mockClear()

    // succeed saved views
    savedViewPatchSpy.mockReturnValueOnce(of(savedViews as SavedView[]))
-    control.setValue(savedViews[0].name)
-    control.markAsDirty()
    component.save()
    expect(toastErrorSpy).not.toHaveBeenCalled()
    expect(savedViewPatchSpy).toHaveBeenCalled()
@@ -133,65 +127,26 @@ describe('SavedViewsComponent', () => {
    expect(patchSpy).not.toHaveBeenCalled()

    const view = savedViews[0]
-    component.savedViewsForm
-      .get('savedViews')
-      .get(view.id.toString())
-      .get('name')
-      .setValue('changed-view-name')
-    component.savedViewsForm
-      .get('savedViews')
-      .get(view.id.toString())
-      .get('name')
-      .markAsDirty()
+    const toggle = fixture.debugElement.query(
+      By.css('.form-check.form-switch input')
+    )
+    toggle.nativeElement.checked = true
+    toggle.nativeElement.dispatchEvent(new Event('change'))
+    // register change
+    component.savedViewsForm.get('savedViews').get(view.id.toString()).value[
+      'show_on_dashboard'
+    ] = !view.show_on_dashboard
    fixture.detectChanges()

    component.save()
-    expect(patchSpy).toHaveBeenCalled()
-    const patchBody = patchSpy.mock.calls[0][0][0]
-    expect(patchBody).toMatchObject({
-      id: view.id,
-      name: 'changed-view-name',
-    })
-    expect(patchBody.show_on_dashboard).toBeUndefined()
-    expect(patchBody.show_in_sidebar).toBeUndefined()
-  })
-
-  it('should persist visibility changes to user settings', () => {
-    const patchSpy = jest.spyOn(savedViewService, 'patchMany')
-    const updateVisibilitySpy = jest
-      .spyOn(settingsService, 'updateSavedViewsVisibility')
-      .mockReturnValue(of({ success: true }))
-
-    const dashboardControl = component.savedViewsForm
-      .get('savedViews')
-      .get(savedViews[0].id.toString())
-      .get('show_on_dashboard')
-    dashboardControl.setValue(false)
-    dashboardControl.markAsDirty()
-
-    component.save()
-
-    expect(patchSpy).not.toHaveBeenCalled()
-    expect(updateVisibilitySpy).toHaveBeenCalledWith([], [savedViews[0].id])
-  })
-
-  it('should skip model updates for views that cannot be edited', () => {
-    const patchSpy = jest.spyOn(savedViewService, 'patchMany')
-    const updateVisibilitySpy = jest.spyOn(
-      settingsService,
-      'updateSavedViewsVisibility'
-    )
-    const nameControl = component.savedViewsForm
-      .get('savedViews')
-      .get(savedViews[0].id.toString())
-      .get('name')
-
-    nameControl.disable()
-
-    component.save()
-
-    expect(patchSpy).not.toHaveBeenCalled()
-    expect(updateVisibilitySpy).not.toHaveBeenCalled()
+    expect(patchSpy).toHaveBeenCalledWith([
+      {
+        id: view.id,
+        name: view.name,
+        show_in_sidebar: view.show_in_sidebar,
+        show_on_dashboard: !view.show_on_dashboard,
+      },
+    ])
  })

  it('should support delete saved view', () => {
@@ -207,55 +162,14 @@ describe('SavedViewsComponent', () => {

  it('should support reset', () => {
    const view = savedViews[0]
-    component.savedViewsForm
-      .get('savedViews')
-      .get(view.id.toString())
-      .get('show_on_dashboard')
-      .setValue(!view.show_on_dashboard)
+    component.savedViewsForm.get('savedViews').get(view.id.toString()).value[
+      'show_on_dashboard'
+    ] = !view.show_on_dashboard
    component.reset()
    expect(
-      component.savedViewsForm
-        .get('savedViews')
-        .get(view.id.toString())
-        .get('show_on_dashboard').value
+      component.savedViewsForm.get('savedViews').get(view.id.toString()).value[
+        'show_on_dashboard'
+      ]
    ).toEqual(view.show_on_dashboard)
  })
-
-  it('should support editing permissions', () => {
-    const confirmClicked = new Subject<any>()
-    const modalRef = {
-      componentInstance: {
-        confirmClicked,
-        buttonsEnabled: true,
-      },
-      close: jest.fn(),
-    } as any
-    jest.spyOn(modalService, 'open').mockReturnValue(modalRef)
-    const patchSpy = jest.spyOn(savedViewService, 'patch')
-    patchSpy.mockReturnValue(of(savedViews[0] as SavedView))
-
-    component.editPermissions(savedViews[0] as SavedView)
-    confirmClicked.next({
-      permissions: {
-        owner: 1,
-        set_permissions: {
-          view: { users: [2], groups: [] },
-          change: { users: [], groups: [3] },
-        },
-      },
-      merge: true,
-    })
-
-    expect(patchSpy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        id: savedViews[0].id,
-        owner: 1,
-        set_permissions: {
-          view: { users: [2], groups: [] },
-          change: { users: [], groups: [3] },
-        },
-      })
-    )
-    expect(modalRef.close).toHaveBeenCalled()
-  })
 })
--- a/src-ui/src/app/components/manage/saved-views/saved-views.component.ts
+++ b/src-ui/src/app/components/manage/saved-views/saved-views.component.ts
@@ -6,18 +6,11 @@ import {
  FormsModule,
  ReactiveFormsModule,
 } from '@angular/forms'
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { dirtyCheck } from '@ngneat/dirty-check-forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { BehaviorSubject, Observable, of, switchMap, takeUntil } from 'rxjs'
-import { PermissionsDialogComponent } from 'src/app/components/common/permissions-dialog/permissions-dialog.component'
+import { BehaviorSubject, Observable, takeUntil } from 'rxjs'
 import { DisplayMode } from 'src/app/data/document'
 import { SavedView } from 'src/app/data/saved-view'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
-import {
-  PermissionAction,
-  PermissionsService,
-} from 'src/app/services/permissions.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -41,18 +34,15 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
    FormsModule,
    ReactiveFormsModule,
    AsyncPipe,
-    NgxBootstrapIconsModule,
  ],
 })
 export class SavedViewsComponent
  extends LoadingComponentWithPermissions
  implements OnInit, OnDestroy
 {
-  private readonly savedViewService = inject(SavedViewService)
-  private readonly permissionsService = inject(PermissionsService)
-  private readonly settings = inject(SettingsService)
-  private readonly toastService = inject(ToastService)
-  private readonly modalService = inject(NgbModal)
+  private savedViewService = inject(SavedViewService)
+  private settings = inject(SettingsService)
+  private toastService = inject(ToastService)

  DisplayMode = DisplayMode

@@ -75,17 +65,11 @@ export class SavedViewsComponent
  }

  ngOnInit(): void {
-    this.reloadViews()
-  }
-
-  private reloadViews(): void {
    this.loading = true
-    this.savedViewService
-      .list(null, null, null, false, { full_perms: true })
-      .subscribe((r) => {
-        this.savedViews = r.results
-        this.initialize()
-      })
+    this.savedViewService.listAll().subscribe((r) => {
+      this.savedViews = r.results
+      this.initialize()
+    })
  }

  ngOnDestroy(): void {
@@ -111,20 +95,16 @@ export class SavedViewsComponent
        display_mode: view.display_mode,
        display_fields: view.display_fields,
      }
-      const canEdit = this.canEditSavedView(view)
      this.savedViewsGroup.addControl(
        view.id.toString(),
        new FormGroup({
-          id: new FormControl({ value: null, disabled: !canEdit }),
-          name: new FormControl({ value: null, disabled: !canEdit }),
-          show_on_dashboard: new FormControl({
-            value: null,
-            disabled: false,
-          }),
-          show_in_sidebar: new FormControl({ value: null, disabled: false }),
-          page_size: new FormControl({ value: null, disabled: !canEdit }),
-          display_mode: new FormControl({ value: null, disabled: !canEdit }),
-          display_fields: new FormControl({ value: [], disabled: !canEdit }),
+          id: new FormControl(null),
+          name: new FormControl(null),
+          show_on_dashboard: new FormControl(null),
+          show_in_sidebar: new FormControl(null),
+          page_size: new FormControl(null),
+          display_mode: new FormControl(null),
+          display_fields: new FormControl([]),
        })
      )
    }
@@ -153,7 +133,10 @@ export class SavedViewsComponent
        $localize`Saved view "${savedView.name}" deleted.`
      )
      this.savedViewService.clearCache()
-      this.reloadViews()
+      this.savedViewService.listAll().subscribe((r) => {
+        this.savedViews = r.results
+        this.initialize()
+      })
    })
  }

@@ -162,120 +145,26 @@ export class SavedViewsComponent
  }

  public save() {
-    // Save only changed views, then save the visibility changes into user settings.
-    const groups = Object.values(this.savedViewsGroup.controls) as FormGroup[]
-    const visibilityChanged = groups.some(
-      (group) =>
-        group.get('show_on_dashboard')?.dirty ||
-        group.get('show_in_sidebar')?.dirty
-    )
-
+    // only patch views that have actually changed
    const changed: SavedView[] = []
-    const dashboardVisibleIds: number[] = []
-    const sidebarVisibleIds: number[] = []
-
-    groups.forEach((group) => {
-      const value = group.getRawValue()
-      if (value.show_on_dashboard) {
-        dashboardVisibleIds.push(value.id)
-      }
-      if (value.show_in_sidebar) {
-        sidebarVisibleIds.push(value.id)
-      }
-      // Would be fine to send, but no longer stored on the model
-      delete value.show_on_dashboard
-      delete value.show_in_sidebar
-
-      if (!group.get('name')?.enabled) {
-        // Quick check for user doesn't have permissions, then bail
-        return
-      }
-
-      const modelFieldsChanged =
-        group.get('name')?.dirty ||
-        group.get('page_size')?.dirty ||
-        group.get('display_mode')?.dirty ||
-        group.get('display_fields')?.dirty
-
-      if (!modelFieldsChanged) {
-        return
-      }
-
-      changed.push(value)
-    })
-
-    if (!changed.length && !visibilityChanged) {
-      return
-    }
-
-    let saveOperation = of([])
+    Object.values(this.savedViewsGroup.controls)
+      .filter((g: FormGroup) => !g.pristine)
+      .forEach((group: FormGroup) => {
+        changed.push(group.value)
+      })
    if (changed.length) {
-      saveOperation = saveOperation.pipe(
-        switchMap(() => this.savedViewService.patchMany(changed))
-      )
-    }
-    if (visibilityChanged) {
-      saveOperation = saveOperation.pipe(
-        switchMap(() =>
-          this.settings.updateSavedViewsVisibility(
-            dashboardVisibleIds,
-            sidebarVisibleIds
-          )
-        )
-      )
-    }
-
-    saveOperation.subscribe({
-      next: () => {
-        this.toastService.showInfo($localize`Views saved successfully.`)
-        this.savedViewService.clearCache()
-        this.reloadViews()
-      },
-      error: (error) => {
-        this.toastService.showError($localize`Error while saving views.`, error)
-      },
-    })
-  }
-
-  public canEditSavedView(view: SavedView): boolean {
-    return this.permissionsService.currentUserHasObjectPermissions(
-      PermissionAction.Change,
-      view
-    )
-  }
-
-  public canDeleteSavedView(view: SavedView): boolean {
-    return this.permissionsService.currentUserOwnsObject(view)
-  }
-
-  public editPermissions(savedView: SavedView): void {
-    const modal = this.modalService.open(PermissionsDialogComponent, {
-      backdrop: 'static',
-    })
-    const dialog = modal.componentInstance as PermissionsDialogComponent
-    dialog.object = savedView
-    dialog.note = $localize`Note: Sharing saved views does not share the underlying documents.`
-
-    modal.componentInstance.confirmClicked.subscribe(({ permissions }) => {
-      modal.componentInstance.buttonsEnabled = false
-      const view = {
-        id: savedView.id,
-        owner: permissions.owner,
-      }
-      view['set_permissions'] = permissions.set_permissions
-      this.savedViewService.patch(view as SavedView).subscribe({
+      this.savedViewService.patchMany(changed).subscribe({
        next: () => {
-          this.toastService.showInfo($localize`Permissions updated`)
-          modal.close()
-          this.reloadViews()
+          this.toastService.showInfo($localize`Views saved successfully.`)
+          this.store.next(this.savedViewsForm.value)
        },
        error: (error) => {
          this.toastService.showError(
-            $localize`Error updating permissions`,
+            $localize`Error while saving views.`,
            error
          )
        },
      })
-    })
+    }
  }
 }
--- a/src-ui/src/app/data/document.ts
+++ b/src-ui/src/app/data/document.ts
@@ -128,15 +128,15 @@ export interface Document extends ObjectWithPermissions {
  checksum?: string

  // UTC
-  created?: string // ISO string
+  created?: Date

-  modified?: string // ISO string
+  modified?: Date

-  added?: string // ISO string
+  added?: Date

  mime_type?: string

-  deleted_at?: string // ISO string
+  deleted_at?: Date

  original_file_name?: string

--- a/src-ui/src/app/data/results.ts
+++ b/src-ui/src/app/data/results.ts
@@ -1,26 +1,7 @@
-import { Document } from './document'
-
 export interface Results<T> {
  count: number

-  display_count?: number
-
  results: T[]
-}

-export interface SelectionDataItem {
-  id: number
-  document_count: number
-}
-
-export interface SelectionData {
-  selected_storage_paths: SelectionDataItem[]
-  selected_correspondents: SelectionDataItem[]
-  selected_tags: SelectionDataItem[]
-  selected_document_types: SelectionDataItem[]
-  selected_custom_fields: SelectionDataItem[]
-}
-
-export interface DocumentResults extends Results<Document> {
-  selection_data?: SelectionData
+  all: number[]
 }
--- a/src-ui/src/app/data/ui-settings.ts
+++ b/src-ui/src/app/data/ui-settings.ts
@@ -62,10 +62,6 @@ export const SETTINGS_KEYS = {
    'general-settings:update-checking:backend-setting',
  SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE:
    'general-settings:saved-views:warn-on-unsaved-change',
-  DASHBOARD_VIEWS_VISIBLE_IDS:
-    'general-settings:saved-views:dashboard-views-visible-ids',
-  SIDEBAR_VIEWS_VISIBLE_IDS:
-    'general-settings:saved-views:sidebar-views-visible-ids',
  DASHBOARD_VIEWS_SORT_ORDER:
    'general-settings:saved-views:dashboard-views-sort-order',
  SIDEBAR_VIEWS_SORT_ORDER:
@@ -252,16 +248,6 @@ export const SETTINGS: UiSetting[] = [
    type: 'array',
    default: [],
  },
-  {
-    key: SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS,
-    type: 'array',
-    default: [],
-  },
-  {
-    key: SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS,
-    type: 'array',
-    default: [],
-  },
  {
    key: SETTINGS_KEYS.DASHBOARD_VIEWS_SORT_ORDER,
    type: 'array',
--- a/src-ui/src/app/data/websocket-document-updated-message.ts
+++ b/src-ui/src/app/data/websocket-document-updated-message.ts
@@ -1,7 +0,0 @@
-export interface WebsocketDocumentUpdatedMessage {
-  document_id: number
-  modified: string
-  owner_id?: number
-  users_can_view?: number[]
-  groups_can_view?: number[]
-}
--- a/src-ui/src/app/services/document-list-view.service.spec.ts
+++ b/src-ui/src/app/services/document-list-view.service.spec.ts
@@ -126,10 +126,13 @@ 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`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    httpTestingController.expectOne(
+      `${environment.apiBaseUrl}documents/selection_data/`
+    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.isReloading).toBeFalsy()
    expect(documentListViewService.activeSavedViewId).toBeNull()
@@ -141,12 +144,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`
    )
    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`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.currentPage).toEqual(1)
@@ -163,7 +166,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&tags__id__in=${tags__id__in}`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(
@@ -171,13 +174,13 @@ describe('DocumentListViewService', () => {
      { 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`
    )
    expect(req.request.method).toEqual('GET')
    // 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`
    )
  })

@@ -185,7 +188,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`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(
@@ -194,7 +197,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`
    )
  })

@@ -209,7 +212,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&tags__id__in=${tags__id__in}`
    )
    expect(req.request.method).toEqual('GET')
    req.flush('Generic error', { status: 404, statusText: 'Unexpected error' })
@@ -217,7 +220,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`
    )
  })

@@ -226,7 +229,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`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.sortField).toEqual('added')
@@ -234,12 +237,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`
    )
    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`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.sortReverse).toBeTruthy()
@@ -259,7 +262,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`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.currentPage).toEqual(page)
@@ -276,7 +279,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&tags__id__all=${tags__id__all}`
    )
    expect(req.request.method).toEqual('GET')
    expect(documentListViewService.filterRules).toEqual([
@@ -286,12 +289,15 @@ describe('DocumentListViewService', () => {
      },
    ])
    req.flush(full_results)
+    httpTestingController.expectOne(
+      `${environment.apiBaseUrl}documents/selection_data/`
+    )
  })

  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&tags__id__all=${tags__id__all}`
    )
    expect(req.request.method).toEqual('GET')
  })
@@ -300,26 +306,34 @@ 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`
      )
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    req = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}documents/selection_data/`
+    )
+    req.flush([])

    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&tags__id__all=${tags__id__all}`
    )
    expect(filteredReqs).toHaveLength(1)
    filteredReqs[0].flush(full_results)
+    req = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}documents/selection_data/`
+    )
+    req.flush([])
    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&tags__id__all=${tags__id__all}`
    )
    expect(req.request.method).toEqual('GET')
  })
@@ -342,21 +356,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&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&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`
    )
    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`
    )
    documentListViewService.activateSavedView(null)
  })
@@ -364,18 +378,21 @@ 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`
    )
    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`
    )
    expect(req.request.method).toEqual('GET')
    req.flush({
      count: 3,
      results: documents.slice(0, 3),
    })
+    httpTestingController
+      .expectOne(`${environment.apiBaseUrl}documents/selection_data/`)
+      .flush([])
    expect(documentListViewService.hasNext(documents[0].id)).toBeTruthy()
    expect(documentListViewService.hasPrevious(documents[0].id)).toBeFalsy()
    documentListViewService.getNext(documents[0].id).subscribe((docId) => {
@@ -422,7 +439,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`
    )
    jest
      .spyOn(documentListViewService, 'getLastPage')
@@ -437,7 +454,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`
    )
    expect(reqs.length).toBeGreaterThan(0)
  })
@@ -472,11 +489,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`
    )
    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`
    )
    const reloadSpy = jest.spyOn(documentListViewService, 'reload')
    documentListViewService.getPrevious(1).subscribe({
@@ -486,7 +503,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`
    )
    expect(reqs.length).toBeGreaterThan(0)
  })
@@ -499,10 +516,13 @@ 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`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    httpTestingController.expectOne(
+      `${environment.apiBaseUrl}documents/selection_data/`
+    )
    documentListViewService.toggleSelected(documents[0])
    expect(documentListViewService.isSelected(documents[0])).toBeTruthy()
    documentListViewService.toggleSelected(documents[0])
@@ -524,13 +544,16 @@ 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`
    )
    expect(req.request.method).toEqual('GET')
    req.flush({
      count: 3,
      results: documents.slice(0, 3),
    })
+    httpTestingController.expectOne(
+      `${environment.apiBaseUrl}documents/selection_data/`
+    )
    documentListViewService.selectPage()
    expect(documentListViewService.selected.size).toEqual(3)
    expect(documentListViewService.isSelected(documents[5])).toBeFalsy()
@@ -539,10 +562,13 @@ 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`
    )
    expect(req.request.method).toEqual('GET')
    req.flush(full_results)
+    httpTestingController.expectOne(
+      `${environment.apiBaseUrl}documents/selection_data/`
+    )
    documentListViewService.toggleSelected(documents[0])
    expect(documentListViewService.isSelected(documents[0])).toBeTruthy()
    documentListViewService.selectRangeTo(documents[2])
@@ -562,7 +588,7 @@ describe('DocumentListViewService', () => {

    documentListViewService.setFilterRules(filterRules)
    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&tags__id__all=9`
    )
    const reqs = httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id&tags__id__all=9`
@@ -578,7 +604,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&tags__id__all=9`
    )
    expect(cancelSpy).toHaveBeenCalled()
  })
@@ -597,7 +623,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`
    )
  })

@@ -624,11 +650,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`
    )
    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`
    )
    expect(documentListViewService.displayFields).toEqual(
      DEFAULT_DISPLAY_FIELDS.filter((f) => f.id !== DisplayField.ADDED).map(
@@ -668,7 +694,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`
    )
    const urlTree = documentListViewService.getQuickFilterUrl(filterRules)
    expect(urlTree).toBeDefined()
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, inject } from '@angular/core'
 import { ParamMap, Router, UrlTree } from '@angular/router'
-import { Observable, Subject, takeUntil } from 'rxjs'
+import { Observable, Subject, first, takeUntil } from 'rxjs'
 import {
  DEFAULT_DISPLAY_FIELDS,
  DisplayField,
@@ -8,7 +8,6 @@ import {
  Document,
 } from '../data/document'
 import { FilterRule } from '../data/filter-rule'
-import { DocumentResults, SelectionData } from '../data/results'
 import { SavedView } from '../data/saved-view'
 import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys'
 import { SETTINGS_KEYS } from '../data/ui-settings'
@@ -18,7 +17,7 @@ import {
  isFullTextFilterRule,
 } from '../utils/filter-rules'
 import { paramsFromViewState, paramsToViewState } from '../utils/query-params'
-import { DocumentService } from './rest/document.service'
+import { DocumentService, SelectionData } from './rest/document.service'
 import { SettingsService } from './settings.service'

 const LIST_DEFAULT_DISPLAY_FIELDS: DisplayField[] = DEFAULT_DISPLAY_FIELDS.map(
@@ -261,17 +260,27 @@ export class DocumentListViewService {
        activeListViewState.sortField,
        activeListViewState.sortReverse,
        activeListViewState.filterRules,
-        { truncate_content: true, include_selection_data: true }
+        { truncate_content: true }
      )
      .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
+
+          this.documentService
+            .getSelectionData(result.all)
+            .pipe(first())
+            .subscribe({
+              next: (selectionData) => {
+                this.selectionData = selectionData
+              },
+              error: () => {
+                this.selectionData = null
+              },
+            })

          if (updateQueryParams && !this._activeSavedViewId) {
            let base = ['/documents']
--- a/src-ui/src/app/services/rest/abstract-name-filter-service.spec.ts
+++ b/src-ui/src/app/services/rest/abstract-name-filter-service.spec.ts
@@ -96,30 +96,6 @@ export const commonAbstractNameFilterPaperlessServiceTests = (
      })
      req.flush([])
    })
-
-    test('should call appropriate api endpoint for bulk delete on all filtered objects', () => {
-      subscription = service
-        .bulk_edit_objects(
-          [],
-          BulkEditObjectOperation.Delete,
-          null,
-          null,
-          true,
-          { name__icontains: 'hello' }
-        )
-        .subscribe()
-      const req = httpTestingController.expectOne(
-        `${environment.apiBaseUrl}bulk_edit_objects/`
-      )
-      expect(req.request.method).toEqual('POST')
-      expect(req.request.body).toEqual({
-        object_type: endpoint,
-        operation: BulkEditObjectOperation.Delete,
-        all: true,
-        filters: { name__icontains: 'hello' },
-      })
-      req.flush([])
-    })
  })

  beforeEach(() => {
--- a/src-ui/src/app/services/rest/abstract-name-filter-service.ts
+++ b/src-ui/src/app/services/rest/abstract-name-filter-service.ts
@@ -37,22 +37,13 @@ export abstract class AbstractNameFilterService<
    objects: Array<number>,
    operation: BulkEditObjectOperation,
    permissions: { owner: number; set_permissions: PermissionsObject } = null,
-    merge: boolean = null,
-    all: boolean = false,
-    filters: { [key: string]: any } = null
+    merge: boolean = null
  ): Observable<string> {
-    const params: any = {
+    const params = {
+      objects,
      object_type: this.resourceName,
      operation,
    }
-    if (all) {
-      params['all'] = true
-      if (filters) {
-        params['filters'] = filters
-      }
-    } else {
-      params['objects'] = objects
-    }
    if (operation === BulkEditObjectOperation.SetPermissions) {
      params['owner'] = permissions?.owner
      params['permissions'] = permissions?.set_permissions
--- a/src-ui/src/app/services/rest/document.service.spec.ts
+++ b/src-ui/src/app/services/rest/document.service.spec.ts
@@ -230,88 +230,6 @@ describe(`DocumentService`, () => {
    })
  })

-  it('should call appropriate api endpoint for delete documents', () => {
-    const ids = [1, 2, 3]
-    subscription = service.deleteDocuments(ids).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/delete/`
-    )
-    expect(req.request.method).toEqual('POST')
-    expect(req.request.body).toEqual({
-      documents: ids,
-    })
-  })
-
-  it('should call appropriate api endpoint for reprocess documents', () => {
-    const ids = [1, 2, 3]
-    subscription = service.reprocessDocuments(ids).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/reprocess/`
-    )
-    expect(req.request.method).toEqual('POST')
-    expect(req.request.body).toEqual({
-      documents: ids,
-    })
-  })
-
-  it('should call appropriate api endpoint for rotate documents', () => {
-    const ids = [1, 2, 3]
-    subscription = service.rotateDocuments(ids, 90).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/rotate/`
-    )
-    expect(req.request.method).toEqual('POST')
-    expect(req.request.body).toEqual({
-      documents: ids,
-      degrees: 90,
-      source_mode: 'latest_version',
-    })
-  })
-
-  it('should call appropriate api endpoint for merge documents', () => {
-    const ids = [1, 2, 3]
-    const args = { metadata_document_id: 1, delete_originals: true }
-    subscription = service.mergeDocuments(ids, args).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/merge/`
-    )
-    expect(req.request.method).toEqual('POST')
-    expect(req.request.body).toEqual({
-      documents: ids,
-      metadata_document_id: 1,
-      delete_originals: true,
-    })
-  })
-
-  it('should call appropriate api endpoint for edit pdf', () => {
-    const ids = [1]
-    const args = { operations: [{ page: 1, rotate: 90, doc: 0 }] }
-    subscription = service.editPdfDocuments(ids, args).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/edit_pdf/`
-    )
-    expect(req.request.method).toEqual('POST')
-    expect(req.request.body).toEqual({
-      documents: ids,
-      operations: [{ page: 1, rotate: 90, doc: 0 }],
-    })
-  })
-
-  it('should call appropriate api endpoint for remove password', () => {
-    const ids = [1]
-    const args = { password: 'secret', update_document: true }
-    subscription = service.removePasswordDocuments(ids, args).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/remove_password/`
-    )
-    expect(req.request.method).toEqual('POST')
-    expect(req.request.body).toEqual({
-      documents: ids,
-      password: 'secret',
-      update_document: true,
-    })
-  })
-
  it('should return the correct preview URL for a single document', () => {
    let url = service.getPreviewUrl(documents[0].id)
    expect(url).toEqual(
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -12,7 +12,7 @@ import {
 import { DocumentMetadata } from 'src/app/data/document-metadata'
 import { DocumentSuggestions } from 'src/app/data/document-suggestions'
 import { FilterRule } from 'src/app/data/filter-rule'
-import { Results, SelectionData } from 'src/app/data/results'
+import { Results } from 'src/app/data/results'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { queryParamsFromFilterRules } from '../../utils/query-params'
 import {
@@ -24,48 +24,17 @@ import { SettingsService } from '../settings.service'
 import { AbstractPaperlessService } from './abstract-paperless-service'
 import { CustomFieldsService } from './custom-fields.service'

-export enum BulkEditSourceMode {
-  LATEST_VERSION = 'latest_version',
-  EXPLICIT_SELECTION = 'explicit_selection',
+export interface SelectionDataItem {
+  id: number
+  document_count: number
 }

-export type DocumentBulkEditMethod =
-  | 'set_correspondent'
-  | 'set_document_type'
-  | 'set_storage_path'
-  | 'add_tag'
-  | 'remove_tag'
-  | 'modify_tags'
-  | 'modify_custom_fields'
-  | 'set_permissions'
-
-export interface MergeDocumentsRequest {
-  metadata_document_id?: number
-  delete_originals?: boolean
-  archive_fallback?: boolean
-  source_mode?: BulkEditSourceMode
-}
-
-export interface EditPdfOperation {
-  page: number
-  rotate?: number
-  doc?: number
-}
-
-export interface EditPdfDocumentsRequest {
-  operations: EditPdfOperation[]
-  delete_original?: boolean
-  update_document?: boolean
-  include_metadata?: boolean
-  source_mode?: BulkEditSourceMode
-}
-
-export interface RemovePasswordDocumentsRequest {
-  password: string
-  update_document?: boolean
-  delete_original?: boolean
-  include_metadata?: boolean
-  source_mode?: BulkEditSourceMode
+export interface SelectionData {
+  selected_storage_paths: SelectionDataItem[]
+  selected_correspondents: SelectionDataItem[]
+  selected_tags: SelectionDataItem[]
+  selected_document_types: SelectionDataItem[]
+  selected_custom_fields: SelectionDataItem[]
 }

@Injectable({
@@ -325,7 +294,7 @@ export class DocumentService extends AbstractPaperlessService<Document> {
    return this.http.get<DocumentMetadata>(url.toString())
  }

-  bulkEdit(ids: number[], method: DocumentBulkEditMethod, args: any) {
+  bulkEdit(ids: number[], method: string, args: any) {
    return this.http.post(this.getResourceUrl(null, 'bulk_edit'), {
      documents: ids,
      method: method,
@@ -333,54 +302,6 @@ export class DocumentService extends AbstractPaperlessService<Document> {
    })
  }

-  deleteDocuments(ids: number[]) {
-    return this.http.post(this.getResourceUrl(null, 'delete'), {
-      documents: ids,
-    })
-  }
-
-  reprocessDocuments(ids: number[]) {
-    return this.http.post(this.getResourceUrl(null, 'reprocess'), {
-      documents: ids,
-    })
-  }
-
-  rotateDocuments(
-    ids: number[],
-    degrees: number,
-    sourceMode: BulkEditSourceMode = BulkEditSourceMode.LATEST_VERSION
-  ) {
-    return this.http.post(this.getResourceUrl(null, 'rotate'), {
-      documents: ids,
-      degrees,
-      source_mode: sourceMode,
-    })
-  }
-
-  mergeDocuments(ids: number[], request: MergeDocumentsRequest = {}) {
-    return this.http.post(this.getResourceUrl(null, 'merge'), {
-      documents: ids,
-      ...request,
-    })
-  }
-
-  editPdfDocuments(ids: number[], request: EditPdfDocumentsRequest) {
-    return this.http.post(this.getResourceUrl(null, 'edit_pdf'), {
-      documents: ids,
-      ...request,
-    })
-  }
-
-  removePasswordDocuments(
-    ids: number[],
-    request: RemovePasswordDocumentsRequest
-  ) {
-    return this.http.post(this.getResourceUrl(null, 'remove_password'), {
-      documents: ids,
-      ...request,
-    })
-  }
-
  getSelectionData(ids: number[]): Observable<SelectionData> {
    return this.http.post<SelectionData>(
      this.getResourceUrl(null, 'selection_data'),
--- a/src-ui/src/app/services/rest/saved-view.service.spec.ts
+++ b/src-ui/src/app/services/rest/saved-view.service.spec.ts
@@ -57,11 +57,6 @@ describe(`Additional service tests for SavedViewService`, () => {
  let settingsService

  it('should retrieve saved views and sort them', () => {
-    jest.spyOn(settingsService, 'get').mockImplementation((key) => {
-      if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS) return [1, 2, 3]
-      if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS) return [1, 2, 3]
-      return []
-    })
    service.reload()
    const req = httpTestingController.expectOne(
      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
@@ -98,9 +93,7 @@ describe(`Additional service tests for SavedViewService`, () => {
  it('should sort dashboard views', () => {
    service['savedViews'] = saved_views
    jest.spyOn(settingsService, 'get').mockImplementation((key) => {
-      if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS) return [1, 2, 3]
      if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_SORT_ORDER) return [3, 1, 2]
-      return []
    })
    expect(service.dashboardViews).toEqual([
      saved_views[2],
@@ -109,21 +102,10 @@ describe(`Additional service tests for SavedViewService`, () => {
    ])
  })

-  it('should use user-specific dashboard visibility when configured', () => {
-    service['savedViews'] = saved_views
-    jest.spyOn(settingsService, 'get').mockImplementation((key) => {
-      if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS) return [4, 2]
-      if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_SORT_ORDER) return []
-    })
-    expect(service.dashboardViews).toEqual([saved_views[1], saved_views[3]])
-  })
-
  it('should sort sidebar views', () => {
    service['savedViews'] = saved_views
    jest.spyOn(settingsService, 'get').mockImplementation((key) => {
-      if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS) return [1, 2, 3]
      if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_SORT_ORDER) return [3, 1, 2]
-      return []
    })
    expect(service.sidebarViews).toEqual([
      saved_views[2],
@@ -132,15 +114,6 @@ describe(`Additional service tests for SavedViewService`, () => {
    ])
  })

-  it('should use user-specific sidebar visibility when configured', () => {
-    service['savedViews'] = saved_views
-    jest.spyOn(settingsService, 'get').mockImplementation((key) => {
-      if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS) return [4, 2]
-      if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_SORT_ORDER) return []
-    })
-    expect(service.sidebarViews).toEqual([saved_views[1], saved_views[3]])
-  })
-
  it('should treat empty display_fields as null', () => {
    subscription = service
      .patch({
--- a/src-ui/src/app/services/rest/saved-view.service.ts
+++ b/src-ui/src/app/services/rest/saved-view.service.ts
@@ -36,9 +36,7 @@ export class SavedViewService extends AbstractPaperlessService<SavedView> {
    return super.list(page, pageSize, sortField, sortReverse, extraParams).pipe(
      tap({
        next: (r) => {
-          const views = r.results.map((view) => this.withUserVisibility(view))
-          this.savedViews = views
-          r.results = views
+          this.savedViews = r.results
          this._loading = false
          this.settingsService.dashboardIsEmpty =
            this.dashboardViews.length === 0
@@ -67,35 +65,8 @@ export class SavedViewService extends AbstractPaperlessService<SavedView> {
    return this.savedViews
  }

-  private getVisibleViewIds(setting: string): number[] {
-    const configured = this.settingsService.get(setting)
-    return Array.isArray(configured) ? configured : []
-  }
-
-  private withUserVisibility(view: SavedView): SavedView {
-    return {
-      ...view,
-      show_on_dashboard: this.isDashboardVisible(view),
-      show_in_sidebar: this.isSidebarVisible(view),
-    }
-  }
-
-  private isDashboardVisible(view: SavedView): boolean {
-    const visibleIds = this.getVisibleViewIds(
-      SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS
-    )
-    return visibleIds.includes(view.id)
-  }
-
-  private isSidebarVisible(view: SavedView): boolean {
-    const visibleIds = this.getVisibleViewIds(
-      SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS
-    )
-    return visibleIds.includes(view.id)
-  }
-
  get sidebarViews(): SavedView[] {
-    const sidebarViews = this.savedViews.filter((v) => this.isSidebarVisible(v))
+    const sidebarViews = this.savedViews.filter((v) => v.show_in_sidebar)

    const sorted: number[] = this.settingsService.get(
      SETTINGS_KEYS.SIDEBAR_VIEWS_SORT_ORDER
@@ -110,9 +81,7 @@ export class SavedViewService extends AbstractPaperlessService<SavedView> {
  }

  get dashboardViews(): SavedView[] {
-    const dashboardViews = this.savedViews.filter((v) =>
-      this.isDashboardVisible(v)
-    )
+    const dashboardViews = this.savedViews.filter((v) => v.show_on_dashboard)

    const sorted: number[] = this.settingsService.get(
      SETTINGS_KEYS.DASHBOARD_VIEWS_SORT_ORDER
--- a/src-ui/src/app/services/settings.service.spec.ts
+++ b/src-ui/src/app/services/settings.service.spec.ts
@@ -320,7 +320,7 @@ describe('SettingsService', () => {
    expect(req.request.method).toEqual('POST')
  })

-  it('should update saved view sorting and visibility', () => {
+  it('should update saved view sorting', () => {
    httpTestingController
      .expectOne(`${environment.apiBaseUrl}ui_settings/`)
      .flush(ui_settings)
@@ -341,15 +341,6 @@ describe('SettingsService', () => {
      SETTINGS_KEYS.SIDEBAR_VIEWS_SORT_ORDER,
      [1, 4]
    )
-    settingsService.updateSavedViewsVisibility([1, 4], [4, 1])
-    expect(setSpy).toHaveBeenCalledWith(
-      SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS,
-      [1, 4]
-    )
-    expect(setSpy).toHaveBeenCalledWith(
-      SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS,
-      [4, 1]
-    )
    httpTestingController
      .expectOne(`${environment.apiBaseUrl}ui_settings/`)
      .flush(ui_settings)
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -699,17 +699,4 @@ export class SettingsService {
    ])
    return this.storeSettings()
  }
-
-  updateSavedViewsVisibility(
-    dashboardVisibleViewIds: number[],
-    sidebarVisibleViewIds: number[]
-  ): Observable<any> {
-    this.set(SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS, [
-      ...new Set(dashboardVisibleViewIds),
-    ])
-    this.set(SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS, [
-      ...new Set(sidebarVisibleViewIds),
-    ])
-    return this.storeSettings()
-  }
 }
--- a/src-ui/src/app/services/websocket-status.service.spec.ts
+++ b/src-ui/src/app/services/websocket-status.service.spec.ts
@@ -416,42 +416,4 @@ describe('ConsumerStatusService', () => {
    websocketStatusService.disconnect()
    expect(deleted).toBeTruthy()
  })
-
-  it('should trigger updated subject on document updated', () => {
-    let updated = false
-    websocketStatusService.onDocumentUpdated().subscribe((data) => {
-      updated = true
-      expect(data.document_id).toEqual(12)
-    })
-
-    websocketStatusService.connect()
-    server.send({
-      type: WebsocketStatusType.DOCUMENT_UPDATED,
-      data: {
-        document_id: 12,
-        modified: '2026-02-17T00:00:00Z',
-        owner_id: 1,
-      },
-    })
-
-    websocketStatusService.disconnect()
-    expect(updated).toBeTruthy()
-  })
-
-  it('should ignore document updated events the user cannot view', () => {
-    let updated = false
-    websocketStatusService.onDocumentUpdated().subscribe(() => {
-      updated = true
-    })
-
-    websocketStatusService.handleDocumentUpdated({
-      document_id: 12,
-      modified: '2026-02-17T00:00:00Z',
-      owner_id: 2,
-      users_can_view: [],
-      groups_can_view: [],
-    })
-
-    expect(updated).toBeFalsy()
-  })
 })
--- a/src-ui/src/app/services/websocket-status.service.ts
+++ b/src-ui/src/app/services/websocket-status.service.ts
@@ -2,7 +2,6 @@ import { Injectable, inject } from '@angular/core'
 import { Subject } from 'rxjs'
 import { environment } from 'src/environments/environment'
 import { User } from '../data/user'
-import { WebsocketDocumentUpdatedMessage } from '../data/websocket-document-updated-message'
 import { WebsocketDocumentsDeletedMessage } from '../data/websocket-documents-deleted-message'
 import { WebsocketProgressMessage } from '../data/websocket-progress-message'
 import { SettingsService } from './settings.service'
@@ -10,7 +9,6 @@ import { SettingsService } from './settings.service'
 export enum WebsocketStatusType {
  STATUS_UPDATE = 'status_update',
  DOCUMENTS_DELETED = 'documents_deleted',
-  DOCUMENT_UPDATED = 'document_updated',
 }

 // see ProgressStatusOptions in src/documents/plugins/helpers.py
@@ -102,20 +100,17 @@ export enum UploadState {
  providedIn: 'root',
 })
 export class WebsocketStatusService {
-  private readonly settingsService = inject(SettingsService)
+  private settingsService = inject(SettingsService)

  private statusWebSocket: WebSocket

  private consumerStatus: FileStatus[] = []

-  private readonly documentDetectedSubject = new Subject<FileStatus>()
-  private readonly documentConsumptionFinishedSubject =
-    new Subject<FileStatus>()
-  private readonly documentConsumptionFailedSubject = new Subject<FileStatus>()
-  private readonly documentDeletedSubject = new Subject<boolean>()
-  private readonly documentUpdatedSubject =
-    new Subject<WebsocketDocumentUpdatedMessage>()
-  private readonly connectionStatusSubject = new Subject<boolean>()
+  private documentDetectedSubject = new Subject<FileStatus>()
+  private documentConsumptionFinishedSubject = new Subject<FileStatus>()
+  private documentConsumptionFailedSubject = new Subject<FileStatus>()
+  private documentDeletedSubject = new Subject<boolean>()
+  private connectionStatusSubject = new Subject<boolean>()

  private get(taskId: string, filename?: string) {
    let status =
@@ -181,10 +176,7 @@ export class WebsocketStatusService {
        data: messageData,
      }: {
        type: WebsocketStatusType
-        data:
-          | WebsocketProgressMessage
-          | WebsocketDocumentsDeletedMessage
-          | WebsocketDocumentUpdatedMessage
+        data: WebsocketProgressMessage | WebsocketDocumentsDeletedMessage
      } = JSON.parse(ev.data)

      switch (type) {
@@ -192,12 +184,6 @@ export class WebsocketStatusService {
          this.documentDeletedSubject.next(true)
          break

-        case WebsocketStatusType.DOCUMENT_UPDATED:
-          this.handleDocumentUpdated(
-            messageData as WebsocketDocumentUpdatedMessage
-          )
-          break
-
        case WebsocketStatusType.STATUS_UPDATE:
          this.handleProgressUpdate(messageData as WebsocketProgressMessage)
          break
@@ -205,11 +191,7 @@ export class WebsocketStatusService {
    }
  }

-  private canViewMessage(messageData: {
-    owner_id?: number
-    users_can_view?: number[]
-    groups_can_view?: number[]
-  }): boolean {
+  private canViewMessage(messageData: WebsocketProgressMessage): boolean {
    // see paperless.consumers.StatusConsumer._can_view
    const user: User = this.settingsService.currentUser
    return (
@@ -269,15 +251,6 @@ export class WebsocketStatusService {
    }
  }

-  handleDocumentUpdated(messageData: WebsocketDocumentUpdatedMessage) {
-    // fallback if backend didn't restrict message
-    if (!this.canViewMessage(messageData)) {
-      return
-    }
-
-    this.documentUpdatedSubject.next(messageData)
-  }
-
  fail(status: FileStatus, message: string) {
    status.message = message
    status.phase = FileStatusPhase.FAILED
@@ -331,10 +304,6 @@ export class WebsocketStatusService {
    return this.documentDeletedSubject
  }

-  onDocumentUpdated() {
-    return this.documentUpdatedSubject
-  }
-
  onConnectionStatus() {
    return this.connectionStatusSubject.asObservable()
  }
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -3,10 +3,10 @@ const base_url = new URL(document.baseURI)
 export const environment = {
  production: true,
  apiBaseUrl: document.baseURI + 'api/',
-  apiVersion: '10', // match src/paperless/settings.py
+  apiVersion: '9', // match src/paperless/settings.py
  appTitle: 'Paperless-ngx',
  tag: 'prod',
-  version: '2.20.10',
+  version: '2.20.9',
  webSocketHost: window.location.host,
  webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
  webSocketBaseUrl: base_url.pathname + 'ws/',
--- a/Show More
+++ b/Show More