prevent overwriting index

Nothing actually passed in something different for the effective_content args, so drop them!
Fix: always index the root for a version
2026-08-20 09:43:29 +00:00 · 2026-08-19 16:50:17 -07:00 · 2026-08-19 16:40:31 -07:00 · 2026-08-19 18:20:04 +00:00 · 2026-08-19 11:17:19 -07:00 · 2026-08-19 09:43:14 -07:00
348 changed files with 22843 additions and 15132 deletions
@@ -1,49 +1,51 @@
 categories:
  - type: 'pre-include'
    when:
      - label: 'enhancement'
      - label: 'bug'
      - label: 'chore'
      - label: 'deployment'
      - label: 'translation'
      - label: 'dependencies'
      - label: 'documentation'
      - label: 'frontend'
      - label: 'backend'
      - label: 'ci-cd'
      - label: 'breaking-change'
      - label: 'notable'
  - type: 'pre-exclude'
    when:
      - label: 'skip-changelog'
  - title: 'Breaking Changes'
-    labels:
+    when:
-      - 'breaking-change'
+      - label: 'breaking-change'
  - title: 'Notable Changes'
-    labels:
+    when:
-      - 'notable'
+      - label: 'notable'
  - title: 'Features / Enhancements'
-    labels:
+    when:
-      - 'enhancement'
+      - label: 'enhancement'
  - title: 'Bug Fixes'
-    labels:
+    when:
-      - 'bug'
+      - label: 'bug'
  - title: 'Documentation'
-    labels:
+    when:
-      - 'documentation'
+      - label: 'documentation'
  - title: 'Maintenance'
-    labels:
+    when:
-      - 'chore'
+      - label: 'chore'
-      - 'deployment'
+      - label: 'deployment'
-      - 'translation'
+      - label: 'translation'
-      - 'ci-cd'
+      - label: 'ci-cd'
  - title: 'Dependencies'
    collapse-after: 3
-    labels:
+    when:
-      - 'dependencies'
+      - label: 'dependencies'
  - title: 'All App Changes'
    labels:
      - 'frontend'
      - 'backend'
    collapse-after: 1
-include-labels:
+    when:
-  - 'enhancement'
+      - label: 'frontend'
-  - 'bug'
+      - label: 'backend'
  - 'chore'
  - 'deployment'
  - 'translation'
  - 'dependencies'
  - 'documentation'
  - 'frontend'
  - 'backend'
  - 'ci-cd'
  - 'breaking-change'
  - 'notable'
 exclude-labels:
  - 'skip-changelog'
 filter-by-commitish: true
 category-template: '### $TITLE'
 change-template: '- $TITLE @$AUTHOR ([#$NUMBER]($URL))'
@@ -11,7 +11,7 @@ concurrency:
  group: backend-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.12.x"
  NLTK_DATA: "/usr/share/nltk_data"
 permissions: {}
 jobs:
@@ -24,7 +24,7 @@ jobs:
      backend_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.backend == 'true' }}
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          fetch-depth: 0
          persist-credentials: false
@@ -63,7 +63,7 @@ jobs:
      - name: Detect changes
        id: filter
        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
        with:
          base: ${{ steps.range.outputs.base }}
          ref: ${{ steps.range.outputs.ref }}
@@ -87,7 +87,7 @@ jobs:
      fail-fast: false
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Start containers
@@ -96,11 +96,11 @@ jobs:
          docker compose --file docker/compose/docker-compose.ci-test.yml up --detach
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "${{ matrix.python-version }}"
      - name: Install uv
-        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -169,16 +169,16 @@ jobs:
      PAPERLESS_SECRET_KEY: "ci-typing-not-a-real-secret"
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "${{ env.DEFAULT_PYTHON }}"
      - name: Install uv
-        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -41,7 +41,7 @@ jobs:
      ref-name: ${{ steps.ref.outputs.name }}
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Determine ref name
@@ -106,9 +106,9 @@ jobs:
          echo "repository=${repo_name}"
          echo "name=${repo_name}" >> $GITHUB_OUTPUT
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@@ -121,7 +121,7 @@ jobs:
          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
      - name: Docker metadata
        id: docker-meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
        with:
          images: |
            ${{ env.REGISTRY }}/${{ steps.repo.outputs.name }}
@@ -132,7 +132,7 @@ jobs:
            type=semver,pattern={{major}}.{{minor}}
      - name: Build and push by digest
        id: build
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
        with:
          context: .
          file: ./Dockerfile
@@ -182,29 +182,29 @@ jobs:
          echo "Downloaded digests:"
          ls -la /tmp/digests/
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Login to Docker Hub
        if: needs.build-arch.outputs.push-external == 'true'
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Login to Quay.io
        if: needs.build-arch.outputs.push-external == 'true'
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          registry: quay.io
          username: ${{ secrets.QUAY_USERNAME }}
          password: ${{ secrets.QUAY_ROBOT_TOKEN }}
      - name: Docker metadata
        id: docker-meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
        with:
          images: |
            ${{ env.REGISTRY }}/${{ needs.build-arch.outputs.repository }}
@@ -11,7 +11,7 @@ concurrency:
 permissions:
  contents: read
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.12.x"
  DEFAULT_PYTHON_VERSION: "3.12"
 jobs:
  changes:
@@ -21,7 +21,7 @@ jobs:
      docs_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.docs == 'true' }}
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          fetch-depth: 0
          persist-credentials: false
@@ -50,7 +50,7 @@ jobs:
      - name: Detect changes
        id: filter
        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
        with:
          base: ${{ steps.range.outputs.base }}
          ref: ${{ steps.range.outputs.ref }}
@@ -69,16 +69,16 @@ jobs:
    steps:
      - uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -21,7 +21,7 @@ jobs:
      frontend_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.frontend == 'true' }}
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          fetch-depth: 0
          persist-credentials: false
@@ -60,7 +60,7 @@ jobs:
      - name: Detect changes
        id: filter
        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
        with:
          base: ${{ steps.range.outputs.base }}
          ref: ${{ steps.range.outputs.ref }}
@@ -77,15 +77,15 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          version: 10
+          package_json_file: src-ui/package.json
      - name: Use Node.js 24
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24.x
          cache: 'pnpm'
@@ -109,15 +109,15 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          version: 10
+          package_json_file: src-ui/package.json
      - name: Use Node.js 24
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24.x
          cache: 'pnpm'
@@ -129,8 +129,8 @@ jobs:
            ~/.pnpm-store
            ~/.cache
          key: ${{ runner.os }}-frontend-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
-      - name: Re-link Angular CLI
+      - name: Install dependencies
-        run: cd src-ui && pnpm link @angular/cli
+        run: cd src-ui && pnpm install --frozen-lockfile
      - name: Run lint
        run: cd src-ui && pnpm run lint
  unit-tests:
@@ -148,15 +148,15 @@ jobs:
        shard-count: [4]
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          version: 10
+          package_json_file: src-ui/package.json
      - name: Use Node.js 24
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24.x
          cache: 'pnpm'
@@ -168,8 +168,8 @@ jobs:
            ~/.pnpm-store
            ~/.cache
          key: ${{ runner.os }}-frontend-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
-      - name: Re-link Angular CLI
+      - name: Install dependencies
-        run: cd src-ui && pnpm link @angular/cli
+        run: cd src-ui && pnpm install --frozen-lockfile
      - name: Run Jest unit tests
        run: cd src-ui && pnpm run test --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
      - name: Upload test results to Codecov
@@ -191,7 +191,7 @@ jobs:
    runs-on: ubuntu-24.04
    permissions:
      contents: read
-    container: mcr.microsoft.com/playwright:v1.61.1-noble
+    container: mcr.microsoft.com/playwright:v1.62.0-noble
    env:
      PLAYWRIGHT_BROWSERS_PATH: /ms-playwright
      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -203,15 +203,15 @@ jobs:
        shard-count: [2]
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          version: 10
+          package_json_file: src-ui/package.json
      - name: Use Node.js 24
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24.x
          cache: 'pnpm'
@@ -223,32 +223,29 @@ jobs:
            ~/.pnpm-store
            ~/.cache
          key: ${{ runner.os }}-frontend-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
      - name: Re-link Angular CLI
        run: cd src-ui && pnpm link @angular/cli
      - name: Install dependencies
-        run: cd src-ui && pnpm install --no-frozen-lockfile
+        run: cd src-ui && pnpm install --frozen-lockfile
      - name: Run Playwright E2E tests
        run: cd src-ui && pnpm exec playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
-  bundle-analysis:
+  frontend-build:
-    name: Bundle Analysis
+    name: Frontend Build
    needs: [changes, unit-tests, e2e-tests]
    if: needs.changes.outputs.frontend_changed == 'true'
    runs-on: ubuntu-24.04
    environment: bundle-analysis
    permissions:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          fetch-depth: 2
          persist-credentials: false
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          version: 10
+          package_json_file: src-ui/package.json
      - name: Use Node.js 24
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24.x
          cache: 'pnpm'
@@ -260,21 +257,19 @@ jobs:
            ~/.pnpm-store
            ~/.cache
          key: ${{ runner.os }}-frontend-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
-      - name: Re-link Angular CLI
+      - name: Install dependencies
-        run: cd src-ui && pnpm link @angular/cli
+        run: cd src-ui && pnpm install --frozen-lockfile
-      - name: Build and analyze
+      - name: Build
        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]
+    needs: [changes, install-dependencies, lint, unit-tests, e2e-tests, frontend-build]
    if: always()
    runs-on: ubuntu-slim
    steps:
      - name: Check gate
        env:
-          BUNDLE_ANALYSIS_RESULT: ${{ needs['bundle-analysis'].result }}
+          BUILD_RESULT: ${{ needs['frontend-build'].result }}
          E2E_RESULT: ${{ needs['e2e-tests'].result }}
          FRONTEND_CHANGED: ${{ needs.changes.outputs.frontend_changed }}
          INSTALL_RESULT: ${{ needs['install-dependencies'].result }}
@@ -306,8 +301,8 @@ jobs:
            exit 1
          fi
-          if [[ "${BUNDLE_ANALYSIS_RESULT}" != "success" ]]; then
+          if [[ "${BUILD_RESULT}" != "success" ]]; then
-            echo "::error::Frontend bundle-analysis job result: ${BUNDLE_ANALYSIS_RESULT}"
+            echo "::error::Frontend build job result: ${BUILD_RESULT}"
            exit 1
          fi
@@ -17,12 +17,12 @@ jobs:
    runs-on: ubuntu-slim
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Install Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.14"
      - name: Run prek
-        uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4
+        uses: j178/prek-action@5337cb91e0fa35a7ff31b9ca345126d8bbbcdf16 # v2.0.6
@@ -8,7 +8,7 @@ concurrency:
  group: release-${{ github.ref }}
  cancel-in-progress: false
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.12.x"
  DEFAULT_PYTHON_VERSION: "3.12"
 permissions: {}
 jobs:
@@ -20,7 +20,7 @@ jobs:
      statuses: read
    steps:
      - name: Wait for Docker build
-        uses: lewagon/wait-on-check-action@96d9100b431964d10e0136aff8b9ccb92470505e # v1.8.0
+        uses: lewagon/wait-on-check-action@2271c86c146b96545b4e871b855e10ffa6f50773 # v1.9.0
        with:
          ref: ${{ github.sha }}
          check-name: 'Merge and Push Manifest'
@@ -35,16 +35,16 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      # ---- Frontend Build ----
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          version: 10
+          package_json_file: src-ui/package.json
      - name: Use Node.js 24
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24.x
          package-manager-cache: false
@@ -55,11 +55,11 @@ jobs:
      # ---- Backend Setup ----
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: false
@@ -171,7 +171,7 @@ jobs:
          fi
      - name: Create release and changelog
        id: create-release
-        uses: release-drafter/release-drafter@4d75298e00d9e34c483e5ff8c68d0ea1c1940c1e # v7.5.1
+        uses: release-drafter/release-drafter@eada3c96a64734dd381cfbda23511034e328ddb0 # v7.6.0
        with:
          name: Paperless-ngx ${{ steps.get-version.outputs.version }}
          tag: ${{ steps.get-version.outputs.version }}
@@ -202,17 +202,17 @@ jobs:
      pull-requests: write
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          ref: main
          persist-credentials: true # for pushing changelog branch
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: false
@@ -22,11 +22,11 @@ jobs:
      security-events: write
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Run zizmor
-        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7
+        uses: zizmorcore/zizmor-action@6fc4b006235f201fdab3722e17240ab420d580e5 # v0.6.1
  semgrep:
    name: Semgrep CE
    runs-on: ubuntu-24.04
@@ -38,13 +38,13 @@ jobs:
      security-events: write
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - name: Run Semgrep
        run: semgrep scan --config auto --sarif-output results.sarif
      - name: Upload results to GitHub code scanning
-        uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/upload-sarif@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
        if: always()
        with:
          sarif_file: results.sarif
@@ -34,12 +34,12 @@ jobs:
        # Learn more about CodeQL language support at https://git.io/codeql-language-support
    steps:
      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,4 +47,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@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
@@ -17,12 +17,12 @@ jobs:
    environment: translation-sync
    steps:
      - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          token: ${{ secrets.PNGX_BOT_PAT }}
          persist-credentials: false
      - name: crowdin action
-        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2.16.3
+        uses: crowdin/github-action@c7af9bc98b01694653031fef2a0dc6c7888ce9bc # v2.17.0
        with:
          upload_translations: false
          download_translations: true
@@ -31,7 +31,7 @@ jobs:
    steps:
      - name: Label PR by file path or branch name
        # see .github/labeler.yml for the labeler config
-        uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
+        uses: actions/labeler@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13 # v7.0.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Label by size
@@ -19,6 +19,6 @@ jobs:
    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@4d75298e00d9e34c483e5ff8c68d0ea1c1940c1e # v7.5.1
+        uses: release-drafter/release-drafter@eada3c96a64734dd381cfbda23511034e328ddb0 # v7.6.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -14,7 +14,7 @@ jobs:
      issues: write
      pull-requests: write
    steps:
-      - uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
+      - uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
        with:
          days-before-stale: 7
          days-before-close: 14
@@ -4,7 +4,7 @@ on:
    branches:
      - dev
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.12.x"
 jobs:
  generate-translate-strings:
    name: Generate Translation Strings
@@ -14,7 +14,7 @@ jobs:
      contents: write
    steps:
      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        env:
          GH_REF: ${{ github.ref }} # sonar rule:githubactions:S7630 - avoid injection
        with:
@@ -23,13 +23,13 @@ jobs:
          persist-credentials: true # for pushing translation branch
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
      - 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@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -45,9 +45,9 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          version: 10
+          package_json_file: src-ui/package.json
      - name: Use Node.js 24
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24.x
          cache: 'pnpm'
@@ -61,16 +61,13 @@ jobs:
            ~/.cache
          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
      - name: Install frontend dependencies
-        if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
+        run: cd src-ui && pnpm install --frozen-lockfile
        run: cd src-ui && pnpm install
      - name: Re-link Angular cli
        run: cd src-ui && pnpm link @angular/cli
      - name: Generate frontend translation strings
        run: |
          cd src-ui
          pnpm run ng extract-i18n
      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
+        uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
        with:
          file_pattern: 'src-ui/messages.xlf src/locale/en_US/LC_MESSAGES/django.po'
          commit_message: "Auto translate strings"
@@ -29,7 +29,7 @@ repos:
      - id: check-case-conflict
      - id: detect-private-key
  - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.2
+    rev: v2.4.3
    hooks:
      - id: codespell
        additional_dependencies: [tomli]
@@ -38,7 +38,7 @@ repos:
          - json
  # See https://github.com/prettier/prettier/issues/15742 for the fork reason
  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: 'v3.9.4'
+    rev: 'v3.9.6'
    hooks:
      - id: prettier
        types_or:
@@ -46,16 +46,16 @@ repos:
          - ts
          - markdown
        additional_dependencies:
-          - prettier@3.9.4
+          - prettier@3.9.6
          - 'prettier-plugin-organize-imports@4.3.0'
  # Python hooks
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.20
+    rev: v0.16.1
    hooks:
      - id: ruff-check
      - id: ruff-format
  - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.25.1"
+    rev: "v2.26.0"
    hooks:
      - id: pyproject-fmt
        additional_dependencies: [tomli]
@@ -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.11.28-python3.12-trixie-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.12.5-python3.14-trixie-slim AS s6-overlay-base
 WORKDIR /usr/src/s6
@@ -24,7 +24,7 @@ services:
    network_mode: host
    restart: unless-stopped
  greenmail:
-    image: docker.io/greenmail/standalone:2.1.9
+    image: docker.io/greenmail/standalone:2.1.11
    hostname: greenmail
    container_name: greenmail
    environment:
@@ -35,7 +35,7 @@ services:
      - "3143:3143" # IMAP
    restart: unless-stopped
  nginx:
-    image: docker.io/nginx:1.31.2-alpine
+    image: docker.io/nginx:1.31.3-alpine
    hostname: nginx
    container_name: nginx
    ports:
@@ -68,7 +68,14 @@
  <!-- <policy domain="resource" name="thread" value="4"/> -->
  <!-- <policy domain="resource" name="throttle" value="0"/> -->
  <!-- <policy domain="resource" name="time" value="3600"/> -->
-  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
+  <!-- Paperless does not process SVG or ImageMagick scripting formats. -->
  <policy domain="coder" rights="none" pattern="SVG" />
  <policy domain="coder" rights="none" pattern="SVGZ" />
  <policy domain="coder" rights="none" pattern="MSVG" />
  <policy domain="coder" rights="none" pattern="RSVG" />
  <policy domain="coder" rights="none" pattern="MSL" />
  <policy domain="coder" rights="none" pattern="MVG" />
  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
  <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
  <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
@@ -78,8 +85,6 @@
  <!-- <policy domain="system" name="pixel-cache-memory" value="anonymous"/> -->
  <!-- <policy domain="system" name="shred" value="2"/> -->
  <!-- <policy domain="system" name="precision" value="6"/> -->
  <!-- not needed due to the need to use explicitly by mvg: -->
  <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
  <!-- use curl -->
  <policy domain="delegate" rights="none" pattern="URL" />
  <policy domain="delegate" rights="none" pattern="HTTPS" />
@@ -0,0 +1,12 @@
 #!/command/with-contenv /usr/bin/bash
 # shellcheck shell=bash
 declare -r log_prefix="[init-llmindex-migrate]"
 echo "${log_prefix} Checking for pending LLM index migrations..."
 cd "${PAPERLESS_SRC_DIR}"
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
 	python3 manage.py document_llmindex migrate
 else
 	s6-setuidgid paperless python3 manage.py document_llmindex migrate
 fi
@@ -0,0 +1 @@
 oneshot
@@ -0,0 +1 @@
 /etc/s6-overlay/s6-rc.d/init-llmindex-migrate/run
@@ -212,6 +212,16 @@ following:
    This is a no-op if the index is already up to date, so it is safe to
    run on every upgrade.
 5.  Migrate the LLM index if needed.
    ```shell-session
    cd src
    python3 manage.py document_llmindex migrate
    ```
    This is a no-op if the index schema is already current, so it is safe
    to run on every upgrade.
 ### Database Upgrades
 Paperless-ngx is compatible with Django-supported versions of PostgreSQL and MariaDB and it is generally
@@ -289,6 +299,8 @@ optional arguments:
 -sm, --split-manifest
 -z,  --zip
 -zn, --zip-name
 --zip-compression
 --zip-compression-level
 --data-only
 --no-progress-bar
 --passphrase
@@ -351,6 +363,19 @@ If `-z` or `--zip` is provided, the export will be a zip file
 in the target directory, named according to the current local date or the
 value set in `-zn` or `--zip-name`.
 The compression method for the zip can be set with `--zip-compression`
 (`stored`, `deflated` (default), `bzip2`, `lzma`, or `zstd`) and tuned with
 `--zip-compression-level` (deflated: 0–9, bzip2: 1–9, zstd: -22–22; ignored
 for `stored` and `lzma`). Both options require `--zip`.
 !!! warning
    `zstd` compression requires Python 3.14 or newer on **both** the machine
    creating the export and any machine importing it. An archive compressed with
    `zstd` (or `lzma`/`bzip2` where those modules are unavailable) cannot be
    imported on a runtime that lacks the codec; the importer will refuse it with
    a clear error. The default `deflated` is universally readable.
 If `--data-only` is provided, only the database will be exported. This option is intended
 to facilitate database upgrades without needing to clean documents and thumbnails from the media directory.
@@ -532,7 +557,7 @@ index is updated automatically on the schedule set by
 can manage it manually:
 ```
-document_llmindex {rebuild,update,compact}
+document_llmindex {rebuild,update,compact,migrate}
 ```
 Specify `rebuild` to build the index from scratch from all documents in the database. Use
@@ -689,6 +714,7 @@ document_fuzzy_match [--ratio] [--processes N]
 | --ratio     | No       | 85.0                | a number between 0 and 100, setting how similar a document must be for it to be reported. Higher numbers mean more similarity. |
 | --processes | No       | 1/4 of system cores | Number of processes to use for matching. Setting 1 disables multiple processes                                                 |
 | --delete    | No       | False               | If provided, one document of a matched pair above the ratio will be deleted.                                                   |
 | --url       | No       | blank               | If an instance URL is provided, the output table will show URLs to each documents instead of the document ID and name.         |
 !!! warning
@@ -227,6 +227,7 @@ Version-aware endpoints:
 - `PATCH /api/documents/{id}/`: content updates target the selected version (`?version={version_id}`) or latest version by default; non-content metadata updates target the root document.
 - `GET /api/documents/{id}/download/`, `GET /api/documents/{id}/preview/`, `GET /api/documents/{id}/thumb/`, `GET /api/documents/{id}/metadata/`: accept `?version={version_id}`.
 - `POST /api/documents/{id}/update_version/`: uploads a new version using multipart form field `document` and optional `version_label`.
 - `POST /api/documents/merge_as_versions/`: merges existing top-level documents as versions of a selected root. The JSON body must contain `documents` (at least two document IDs) and `root_document_id` (one of those IDs). When merging one source document, an optional `version_label` may be provided.
 - `PATCH /api/documents/{id}/versions/{version_id}/`: updates the `version_label` of a specific version.
 - `DELETE /api/documents/{root_id}/versions/{version_id}/`: deletes a non-root version.
@@ -1,5 +1,111 @@
 # Changelog
 ## paperless-ngx 3.0.5
 ### Bug Fixes
 - Fix: accept Whoosh-era abbreviated relative-date units (yrs, mos, wks, etc) in search queries [@stumpylog](https://github.com/stumpylog) ([#13486](https://github.com/paperless-ngx/paperless-ngx/pull/13486))
 - Fix: fix edit dialog error change detection [@shamoon](https://github.com/shamoon) ([#13483](https://github.com/paperless-ngx/paperless-ngx/pull/13483))
 - Fix: key the AI suggestion cache by model and endpoint [@lunetics](https://github.com/lunetics) ([#13449](https://github.com/paperless-ngx/paperless-ngx/pull/13449))
 - Fix: validate custom field values in bulk operations [@shamoon](https://github.com/shamoon) ([#13457](https://github.com/paperless-ngx/paperless-ngx/pull/13457))
 - Fixhancement: better handle empty fields from AI suggestions [@shamoon](https://github.com/shamoon) ([#13454](https://github.com/paperless-ngx/paperless-ngx/pull/13454))
 - Fix: normalize monetary decimal symbol by locale [@shamoon](https://github.com/shamoon) ([#13427](https://github.com/paperless-ngx/paperless-ngx/pull/13427))
 - Fix: fold overflowing path text in sanity checker [@stumpylog](https://github.com/stumpylog) ([#13426](https://github.com/paperless-ngx/paperless-ngx/pull/13426))
 - Fix: correct delayed add field button for custom fields [@shamoon](https://github.com/shamoon) ([#13424](https://github.com/paperless-ngx/paperless-ngx/pull/13424))
 - Fix: hide attributes collapse / show button without UI settings [@shamoon](https://github.com/shamoon) ([#13425](https://github.com/paperless-ngx/paperless-ngx/pull/13425))
 - Fix: consolidate born-digital PDF detection between archive decision and OCR [@stumpylog](https://github.com/stumpylog) ([#13409](https://github.com/paperless-ngx/paperless-ngx/pull/13409))
 - Fix: prevent scale vs page loop in pngx PDF viewer [@shamoon](https://github.com/shamoon) ([#13406](https://github.com/paperless-ngx/paperless-ngx/pull/13406))
 - Fix: handle hidden line breaks in email subjects when sending email [@shamoon](https://github.com/shamoon) ([#13402](https://github.com/paperless-ngx/paperless-ngx/pull/13402))
 - Fix: avoid NotSupportedError from document\_importer on MariaDB [@stumpylog](https://github.com/stumpylog) ([#13400](https://github.com/paperless-ngx/paperless-ngx/pull/13400))
 - Fix: exclude next-period start from relative date-range filters [@stumpylog](https://github.com/stumpylog) ([#13381](https://github.com/paperless-ngx/paperless-ngx/pull/13381))
 - Fix: close non-atomic db connections in before\_task\_publish [@shamoon](https://github.com/shamoon) ([#13366](https://github.com/paperless-ngx/paperless-ngx/pull/13366))
 - Chore/fix: refactor frontend task service [@shamoon](https://github.com/shamoon) ([#13365](https://github.com/paperless-ngx/paperless-ngx/pull/13365))
 - Fix: fix Enter selection in search autocomplete [@shamoon](https://github.com/shamoon) ([#13361](https://github.com/paperless-ngx/paperless-ngx/pull/13361))
 ### Documentation
 - Documentation: PAPERLESS\_CONSUMER\_IGNORE\_PATTERNS clarifications [@shamoon](https://github.com/shamoon) ([#13489](https://github.com/paperless-ngx/paperless-ngx/pull/13489))
 - Documentation: Add Password Removal workflow action documentation [@stumpylog](https://github.com/stumpylog) ([#13377](https://github.com/paperless-ngx/paperless-ngx/pull/13377))
 ### Dependencies
 - Chore(deps): Bump pymdown-extensions from 10.21.3 to 11.0 in the uv group across 1 directory @[dependabot[bot]](https://github.com/apps/dependabot) ([#13378](https://github.com/paperless-ngx/paperless-ngx/pull/13378))
 ### All App Changes
 <details>
 <summary>21 changes</summary>
 - Fix: accept Whoosh-era abbreviated relative-date units (yrs, mos, wks, etc) in search queries [@stumpylog](https://github.com/stumpylog) ([#13486](https://github.com/paperless-ngx/paperless-ngx/pull/13486))
 - Fix: fix edit dialog error change detection [@shamoon](https://github.com/shamoon) ([#13483](https://github.com/paperless-ngx/paperless-ngx/pull/13483))
 - Performance: sqlite-vec point-delete for document chunks [@stumpylog](https://github.com/stumpylog) ([#13438](https://github.com/paperless-ngx/paperless-ngx/pull/13438))
 - Fix: key the AI suggestion cache by model and endpoint [@lunetics](https://github.com/lunetics) ([#13449](https://github.com/paperless-ngx/paperless-ngx/pull/13449))
 - Fix: validate custom field values in bulk operations [@shamoon](https://github.com/shamoon) ([#13457](https://github.com/paperless-ngx/paperless-ngx/pull/13457))
 - Fixhancement: better handle empty fields from AI suggestions [@shamoon](https://github.com/shamoon) ([#13454](https://github.com/paperless-ngx/paperless-ngx/pull/13454))
 - Performance: Use server side iterators during LLM index updating [@stumpylog](https://github.com/stumpylog) ([#13430](https://github.com/paperless-ngx/paperless-ngx/pull/13430))
 - Fix: normalize monetary decimal symbol by locale [@shamoon](https://github.com/shamoon) ([#13427](https://github.com/paperless-ngx/paperless-ngx/pull/13427))
 - Fix: fold overflowing path text in sanity checker [@stumpylog](https://github.com/stumpylog) ([#13426](https://github.com/paperless-ngx/paperless-ngx/pull/13426))
 - Fix: correct delayed add field button for custom fields [@shamoon](https://github.com/shamoon) ([#13424](https://github.com/paperless-ngx/paperless-ngx/pull/13424))
 - Fix: hide attributes collapse / show button without UI settings [@shamoon](https://github.com/shamoon) ([#13425](https://github.com/paperless-ngx/paperless-ngx/pull/13425))
 - Fix: consolidate born-digital PDF detection between archive decision and OCR [@stumpylog](https://github.com/stumpylog) ([#13409](https://github.com/paperless-ngx/paperless-ngx/pull/13409))
 - Fix: prevent scale vs page loop in pngx PDF viewer [@shamoon](https://github.com/shamoon) ([#13406](https://github.com/paperless-ngx/paperless-ngx/pull/13406))
 - Fix: handle hidden line breaks in email subjects when sending email [@shamoon](https://github.com/shamoon) ([#13402](https://github.com/paperless-ngx/paperless-ngx/pull/13402))
 - Fix: avoid NotSupportedError from document\_importer on MariaDB [@stumpylog](https://github.com/stumpylog) ([#13400](https://github.com/paperless-ngx/paperless-ngx/pull/13400))
 - Tweak: adjust doc details button toolbar flow [@shamoon](https://github.com/shamoon) ([#13382](https://github.com/paperless-ngx/paperless-ngx/pull/13382))
 - Fix: exclude next-period start from relative date-range filters [@stumpylog](https://github.com/stumpylog) ([#13381](https://github.com/paperless-ngx/paperless-ngx/pull/13381))
 - Chore(deps): Bump pymdown-extensions from 10.21.3 to 11.0 in the uv group across 1 directory @[dependabot[bot]](https://github.com/apps/dependabot) ([#13378](https://github.com/paperless-ngx/paperless-ngx/pull/13378))
 - Fix: close non-atomic db connections in before\_task\_publish [@shamoon](https://github.com/shamoon) ([#13366](https://github.com/paperless-ngx/paperless-ngx/pull/13366))
 - Chore/fix: refactor frontend task service [@shamoon](https://github.com/shamoon) ([#13365](https://github.com/paperless-ngx/paperless-ngx/pull/13365))
 - Fix: fix Enter selection in search autocomplete [@shamoon](https://github.com/shamoon) ([#13361](https://github.com/paperless-ngx/paperless-ngx/pull/13361))
 </details>
 ## paperless-ngx 3.0.4
 ### Bug Fixes
 - Fix: prevent pdfjs highlight scrolling from affecting the entire page [@shamoon](https://github.com/shamoon) ([#13355](https://github.com/paperless-ngx/paperless-ngx/pull/13355))
 - Fix: don't skip OCR/archive for tagged PDFs with no actual text [@stumpylog](https://github.com/stumpylog) ([#13351](https://github.com/paperless-ngx/paperless-ngx/pull/13351))
 - Performance: more efficient diacritic normalization in dropdown filtering [@shamoon](https://github.com/shamoon) ([#13347](https://github.com/paperless-ngx/paperless-ngx/pull/13347))
 - Fix: dedupe permission-visible documents when combined with multi-tag filters [@stumpylog](https://github.com/stumpylog) ([#13345](https://github.com/paperless-ngx/paperless-ngx/pull/13345))
 - Fixhancement: pass LLM output language to chat if specified [@shamoon](https://github.com/shamoon) ([#13340](https://github.com/paperless-ngx/paperless-ngx/pull/13340))
 - Fix: ensure preview reload on live changes [@shamoon](https://github.com/shamoon) ([#13321](https://github.com/paperless-ngx/paperless-ngx/pull/13321))
 - Fix: clamp all out out-of-range possible fields [@stumpylog](https://github.com/stumpylog) ([#13316](https://github.com/paperless-ngx/paperless-ngx/pull/13316))
 - Fix: add docstring to DocumentClassifierSchema for cleaner LLM tool description [@stumpylog](https://github.com/stumpylog) ([#13315](https://github.com/paperless-ngx/paperless-ngx/pull/13315))
 - Fix: guard build\_document\_node against stale FK on deleted correspondent/doc type [@stumpylog](https://github.com/stumpylog) ([#13318](https://github.com/paperless-ngx/paperless-ngx/pull/13318))
 - Fix: prevent search filter loss when closing document with Escape key [@shamoon](https://github.com/shamoon) ([#13317](https://github.com/paperless-ngx/paperless-ngx/pull/13317))
 - Fix: fix frontend permissions display for stats/system perms [@shamoon](https://github.com/shamoon) ([#13305](https://github.com/paperless-ngx/paperless-ngx/pull/13305))
 ### Documentation
 - Documentation: fix PAPERLESS\_AI\_LLM\_OUTPUT\_LANGUAGE heading level [@SuperSandro2000](https://github.com/SuperSandro2000) ([#13341](https://github.com/paperless-ngx/paperless-ngx/pull/13341))
 ### Dependencies
 - Chore: resolve npm provenance issues with chokidar and semver [@shamoon](https://github.com/shamoon) ([#13323](https://github.com/paperless-ngx/paperless-ngx/pull/13323))
 ### All App Changes
 <details>
 <summary>14 changes</summary>
 - Fix: prevent pdfjs highlight scrolling from affecting the entire page [@shamoon](https://github.com/shamoon) ([#13355](https://github.com/paperless-ngx/paperless-ngx/pull/13355))
 - Fix: don't skip OCR/archive for tagged PDFs with no actual text [@stumpylog](https://github.com/stumpylog) ([#13351](https://github.com/paperless-ngx/paperless-ngx/pull/13351))
 - Performance: more efficient diacritic normalization in dropdown filtering [@shamoon](https://github.com/shamoon) ([#13347](https://github.com/paperless-ngx/paperless-ngx/pull/13347))
 - Performance: prefetch notes and custom fields for LLM index text building [@stumpylog](https://github.com/stumpylog) ([#13350](https://github.com/paperless-ngx/paperless-ngx/pull/13350))
 - Fix: dedupe permission-visible documents when combined with multi-tag filters [@stumpylog](https://github.com/stumpylog) ([#13345](https://github.com/paperless-ngx/paperless-ngx/pull/13345))
 - Performance: Scope llm index updates to actually modified documents [@stumpylog](https://github.com/stumpylog) ([#13322](https://github.com/paperless-ngx/paperless-ngx/pull/13322))
 - Fixhancement: pass LLM output language to chat if specified [@shamoon](https://github.com/shamoon) ([#13340](https://github.com/paperless-ngx/paperless-ngx/pull/13340))
 - Chore: resolve npm provenance issues with chokidar and semver [@shamoon](https://github.com/shamoon) ([#13323](https://github.com/paperless-ngx/paperless-ngx/pull/13323))
 - Fix: ensure preview reload on live changes [@shamoon](https://github.com/shamoon) ([#13321](https://github.com/paperless-ngx/paperless-ngx/pull/13321))
 - Fix: clamp all out out-of-range possible fields [@stumpylog](https://github.com/stumpylog) ([#13316](https://github.com/paperless-ngx/paperless-ngx/pull/13316))
 - Fix: add docstring to DocumentClassifierSchema for cleaner LLM tool description [@stumpylog](https://github.com/stumpylog) ([#13315](https://github.com/paperless-ngx/paperless-ngx/pull/13315))
 - Fix: guard build\_document\_node against stale FK on deleted correspondent/doc type [@stumpylog](https://github.com/stumpylog) ([#13318](https://github.com/paperless-ngx/paperless-ngx/pull/13318))
 - Fix: prevent search filter loss when closing document with Escape key [@shamoon](https://github.com/shamoon) ([#13317](https://github.com/paperless-ngx/paperless-ngx/pull/13317))
 - Fix: fix frontend permissions display for stats/system perms [@shamoon](https://github.com/shamoon) ([#13305](https://github.com/paperless-ngx/paperless-ngx/pull/13305))
 </details>
 ## paperless-ngx 3.0.3
 ### Bug Fixes
@@ -776,6 +776,24 @@ system. See the corresponding
    Defaults to "groups"
 #### [`PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP=<str>`](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP) {#PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP}
 : Allows you to define a group name that, if present in the third-party authentication system's groups claim, will grant the user superuser (admin) and staff status in Paperless-ngx. If the group is not present in the claim, superuser status will be revoked upon next login.
    !!! warning
        This is a direct reflection of the claim on every login, including the connecting user, with no exemption for the last remaining admin. If the group is missing or misconfigured on the identity provider side, the logged-in user will immediately lose their own superuser access. Fix the group membership or claim mapping on the identity provider to restore it. If the identity provider itself is unreachable or misconfigured and you are locked out, you can recover admin access locally with `manage.py createsuperuser`.
    Defaults to None
 #### [`PAPERLESS_SOCIAL_ACCOUNT_SYNC_STAFF_GROUP=<str>`](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_STAFF_GROUP) {#PAPERLESS_SOCIAL_ACCOUNT_SYNC_STAFF_GROUP}
 : Allows you to define a group name that, if present in the third-party authentication system's groups claim, will grant the user staff status in Paperless-ngx. If the group is not present in the claim and the user is not a superuser, staff status will be revoked upon next login.
    !!! warning
        As with [`PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP`](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP), this is applied on every login unconditionally, including for the connecting user themselves.
    Defaults to None
 #### [`PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS=<comma-separated-list>`](#PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS) {#PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS}
 : A list of group names that users who signup via social accounts will be added to upon signup. Groups listed here must already exist.
@@ -948,10 +966,11 @@ for display in the web interface.
    !!! note
-        The **remote OCR parser** (Azure AI) always produces a searchable
+        The **remote OCR parser** (Azure AI) also honors this setting: when
-        PDF and stores it as the archive copy, regardless of this setting.
+        no archive is requested (`never`, or `auto` with a born-digital PDF),
-        `ARCHIVE_FILE_GENERATION=never` has no effect when the remote
+        the remote engine is skipped entirely and locally-extracted text is
-        parser handles a document.
+        used instead, avoiding an unnecessary API call and a duplicate text
        layer.
 #### [`PAPERLESS_OCR_CLEAN=<mode>`](#PAPERLESS_OCR_CLEAN) {#PAPERLESS_OCR_CLEAN}
@@ -1360,13 +1379,16 @@ don't exist yet.
 #### [`PAPERLESS_CONSUMER_IGNORE_PATTERNS=<json>`](#PAPERLESS_CONSUMER_IGNORE_PATTERNS) {#PAPERLESS_CONSUMER_IGNORE_PATTERNS}
 : Additional regex patterns for files to ignore in the consumption directory. Patterns are matched against filenames only (not full paths)
-using Python's `re.match()`, which anchors at the start of the filename.
+using Python's `re.search()`. Use `^` to anchor a pattern to the start of the filename and `$` to anchor it to the end.
    See the [watchfiles documentation](https://watchfiles.helpmanual.io/api/filters/#watchfiles.BaseFilter.ignore_entity_patterns)
    This setting is for additional patterns beyond the built-in defaults. Common system files and directories are already ignored automatically.
    The patterns will be compiled via Python's standard `re` module.
    These are regular expressions, not glob patterns. For example, the glob pattern `._*` does not mean "starts with `._`" when used as a
    regular expression; it matches nearly any non-empty filename. Use `^\._.*` for that behavior instead.
    Example custom patterns:
    ```json
@@ -1381,7 +1403,11 @@ using Python's `re.match()`, which anchors at the start of the filename.
    Defaults to `[]` (empty list, uses only built-in defaults).
-    The default ignores are `[.DS_Store, .DS_STORE, ._*, desktop.ini, Thumbs.db]` and cannot be overridden.
+    The built-in file patterns are equivalent to the following regular expressions and cannot be overridden:
    ```json
    ["^\\.DS_Store$", "^\\.DS_STORE$", "^\\._.*", "^desktop\\.ini$", "^Thumbs\\.db$"]
    ```
 #### [`PAPERLESS_CONSUMER_IGNORE_DIRS=<json>`](#PAPERLESS_CONSUMER_IGNORE_DIRS) {#PAPERLESS_CONSUMER_IGNORE_DIRS}
@@ -187,10 +187,11 @@ PAPERLESS_ARCHIVE_FILE_GENERATION=auto
 ### Remote OCR parser
-If you use the **remote OCR parser** (Azure AI), note that it always produces a
+If you use the **remote OCR parser** (Azure AI), `ARCHIVE_FILE_GENERATION` is
-searchable PDF and stores it as the archive copy. `ARCHIVE_FILE_GENERATION=never`
+honored the same way as for the local engine: when no archive is requested
-has no effect for documents handled by the remote parser - the archive is produced
+(`never`, or `auto` with a born-digital PDF), the remote engine is skipped
-unconditionally by the remote engine.
+entirely and locally-extracted text is used instead, avoiding an unnecessary
 API call and a duplicate text layer.
 ## Search Index (Whoosh -> Tantivy)
@@ -416,22 +416,15 @@ to a positive number to enable polling and disable native filesystem notificatio
        You may need to change the path in the files. Example:
        `ExecStart=/opt/paperless/.local/bin/celery --app paperless worker --loglevel INFO`
-12. Configure ImageMagick to allow processing of PDF documents. Most
+12. Configure ImageMagick to allow processing of PDF documents and disable
-    distributions have this disabled by default, since PDF documents can
+    formats that Paperless-ngx does not use. Most distributions disable PDF
-    contain malware. If you don't do this, Paperless-ngx will fall back to
+    processing by default, since PDF documents can contain malware. If you
-    Ghostscript for certain steps such as thumbnail generation.
+    don't enable it, Paperless-ngx will fall back to Ghostscript for certain
    steps such as thumbnail generation.
-    Edit `/etc/ImageMagick-6/policy.xml` and adjust
+    Configure the active ImageMagick policy file (commonly
-
+    `/etc/ImageMagick-6/policy.xml` or `/etc/ImageMagick-7/policy.xml`) and
-    ```
+    adjust similar to [the docker policy file](https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/refs/heads/main/docker/rootfs/etc/ImageMagick-6/paperless-policy.xml). You should also include restrictions as noted there.
    <policy domain="coder" rights="none" pattern="PDF" />
    ```
    to
    ```
    <policy domain="coder" rights="read|write" pattern="PDF" />
    ```
 **Optional: Install the [jbig2enc](https://ocrmypdf.readthedocs.io/en/latest/jbig2.html) encoder.**
 This will reduce the size of generated PDF documents. You'll most likely need to compile this yourself, because this
@@ -99,6 +99,10 @@ Think of versions as **file history** for a document.
 - 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.
 - From the document list, select two or more documents and choose **Merge as versions** to combine them under one entry. Select the root document whose metadata and permissions should be retained; the other selected documents become file versions. The root may already have versions, but documents being added as versions must not have version histories of their own.
 - From a document's **Versions** menu, choose **Existing** to search for another document and add it as a version of the current document.
 - Documents merged as versions give up their archive serial number. If the root has no ASN of its own it takes the first one, otherwise the ASNs are released and the removal is logged.
 - Merging as versions cannot be undone from the UI, and deleting the root document moves its versions to the trash as well.
 ### Management Lists
@@ -576,7 +580,9 @@ The following workflow action types are available:
 - Tags, correspondent, document type and storage path
 - Document owner
 - View and / or edit permissions to users or groups
- Custom fields. Note that no value for the field will be set
+- Custom fields, optionally with a value. If no value is set, the field is only added to the
  document and any value it may already have is left untouched. If a value is set, it will
  overwrite an existing value of that field on the document.
 ##### Removal {#workflow-action-removal}
@@ -620,6 +626,34 @@ no other workflow will be executed on the document.
 If a "Move to Trash" action is executed in a consume pipeline, the consumption
 will be aborted and the file will be deleted.
 ##### Password Removal {#workflow-action-password-removal}
 "Password Removal" actions attempt to remove password protection from encrypted PDF documents. You can specify:
 - One or more passwords to try, separated by commas or new lines
 - Each password is tried in order until one successfully unlocks the document
 Password removal never modifies a file in place. Instead, once a working password is found, the
 decrypted content is consumed as a new [document version](#document-file-versions), leaving the
 original (still encrypted) version in the document's version history.
 **Consumption Started**: because this trigger fires before the document exists yet, the password
 removal itself is deferred until after the initial consumption of the encrypted file has completed.
 OCR engines cannot process an encrypted PDF, so this first version is typically stored with no
 extracted text (unless the file already contained extractable text outside of OCR). Immediately
 afterwards, the password is removed and the decrypted file is automatically re-consumed as a second,
 new version of the same document, this time with normal OCR/text extraction applied. In other words,
 a password-protected file added with this trigger will briefly exist as an un-OCR'd version before
 the properly processed version is created.
 **Document Added**, **Document Updated**, **Scheduled**: these triggers run against a document that
 already exists, so password removal happens immediately: the decrypted content is queued for
 consumption as a new version right away. Note that if the document's initial consumption also
 happened while it was still encrypted, that original version will likewise be missing OCR text.
 **Current limitation**: Passwords are stored as a simple list without descriptions. To handle
 multiple PDF types with different passwords, create separate workflows for each use case.
 #### Workflow placeholders
 Titles and webhook payloads can be generated by workflows using [Jinja templates](https://jinja.palletsprojects.com/en/3.1.x/templates/).
@@ -34,6 +34,8 @@ PAPERLESS_SECRET_KEY=change-me
 #PAPERLESS_AUTO_LOGIN_USERNAME=
 #PAPERLESS_COOKIE_PREFIX=
 #PAPERLESS_ENABLE_HTTP_REMOTE_USER=false
 #PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP=
 #PAPERLESS_SOCIAL_ACCOUNT_SYNC_STAFF_GROUP=
 # OCR settings
@@ -1,6 +1,6 @@
 [project]
 name = "paperless-ngx"
-version = "3.0.4"
+version = "3.0.5"
 description = "A community-supported supercharged document management system: scan, index and archive all your physical documents"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -21,7 +21,7 @@ dependencies = [
  "channels~=4.2",
  "channels-redis~=4.2",
  "concurrent-log-handler~=0.9.25",
-  "dateparser~=1.2",
+  "dateparser~=1.4",
  # WARNING: django does not use semver.
  #          Only patch versions are guaranteed to not introduce breaking changes.
  "django~=5.2.13",
@@ -32,33 +32,32 @@ dependencies = [
  "django-cors-headers~=4.9.0",
  "django-extensions~=4.1",
  "django-filter~=25.1",
-  "django-guardian~=3.3.0",
+  "django-guardian~=3.3.3",
  "django-multiselectfield~=1.0.1",
  "django-rich~=2.2.0",
  "django-soft-delete~=1.0.18",
  "django-treenode>=0.24",
  "djangorestframework~=3.16",
-  "djangorestframework-guardian~=0.4.0",
+  "drf-spectacular~=0.30",
-  "drf-spectacular~=0.28",
+  "drf-spectacular-sidecar~=2026.7.1",
  "drf-spectacular-sidecar~=2026.5.1",
  "drf-writable-nested~=0.7.1",
-  "filelock~=3.29.0",
+  "filelock~=3.32.0",
  "flower~=2.0.1",
  "gotenberg-client~=0.14.0",
-  "httpx-oauth~=0.16",
+  "httpx-oauth~=0.17",
-  "ijson>=3.2",
+  "ijson>=3.5.1",
-  "imap-tools~=1.13.0",
+  "imap-tools~=1.14.0",
  "jinja2~=3.1.5",
  "langdetect~=1.0.9",
-  "llama-index-core>=0.14.22",
+  "llama-index-core>=0.14.23",
  "llama-index-embeddings-huggingface>=0.6.1",
  "llama-index-embeddings-ollama>=0.9",
  "llama-index-embeddings-openai-like>=0.2.2",
  "llama-index-llms-ollama>=0.9.1",
  "llama-index-llms-openai-like>=0.7.1",
  "nltk~=3.10.0",
-  "ocrmypdf~=17.4.2",
+  "ocrmypdf~=17.7.0",
-  "openai>=2.32",
+  "openai>=2.48",
  "pathvalidate~=3.3.1",
  "pdf2image~=1.17.0",
  "python-dateutil~=2.9.0",
@@ -68,26 +67,26 @@ dependencies = [
  "python-magic~=0.4.27",
  "rapidfuzz~=3.14.5",
  "redis[hiredis]~=5.2.1",
-  "regex>=2026.4.4",
+  "regex>=2026.7.19",
-  "scikit-learn~=1.8.0",
+  "scikit-learn~=1.9.0",
-  "sentence-transformers>=5.4.1",
+  "sentence-transformers>=5.6.1",
  "setproctitle~=1.3.4",
  "sqlite-vec==0.1.9",
  "tantivy~=0.26.0",
  "tika-client~=0.11.0",
  "torch~=2.13.0",
-  "watchfiles>=1.1.1",
+  "watchfiles>=1.2",
  "whitenoise~=6.11",
-  "zxing-cpp~=3.0.0",
+  "zxing-cpp~=3.1.0",
 ]
 [project.optional-dependencies]
 mariadb = [
  "mysqlclient~=2.2.7",
 ]
 postgres = [
-  "psycopg[c,pool]==3.3",
+  "psycopg[c,pool]==3.3.4",
  # Direct dependency for proper resolution of the pre-built wheels
-  "psycopg-c==3.3",
+  "psycopg-c==3.3.4",
  "psycopg-pool==3.3.1",
 ]
 webserver = [
@@ -101,25 +100,25 @@ dev = [
  { include-group = "testing" },
 ]
 docs = [
-  "zensical>=0.0.47",
+  "zensical>=0.0.51",
 ]
 lint = [
-  "prek~=0.3.10",
+  "prek~=0.4.11",
-  "ruff~=0.15.20",
+  "ruff~=0.16.1",
 ]
 testing = [
  "daphne",
  "factory-boy~=3.3.1",
-  "faker~=40.15.0",
+  "faker~=40.36.0",
  "imagehash",
-  "pytest~=9.0.3",
+  "pytest~=9.1.1",
  "pytest-cov~=7.1.0",
  "pytest-django~=4.12.0",
-  "pytest-env~=1.6.0",
+  "pytest-env~=1.7.0",
  "pytest-httpx",
  "pytest-mock~=3.15.1",
  # "pytest-randomly~=4.0.1",
-  "pytest-rerunfailures~=16.1",
+  "pytest-rerunfailures~=16.4",
  "pytest-sugar",
  "pytest-xdist~=3.8.0",
  "time-machine>=2.13",
@@ -161,8 +160,10 @@ explicit = true
 [tool.uv.sources]
 # Markers are chosen to select these almost exclusively when building the Docker image
 psycopg-c = [
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.0/psycopg_c-3.3.0-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.4/psycopg_c-3.3.4-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.0/psycopg_c-3.3.0-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.4/psycopg_c-3.3.4-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.4/psycopg_c-3.3.4-cp314-cp314-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.14'" },
  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.4/psycopg_c-3.3.4-cp314-cp314-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.14'" },
 ]
 torch = [
  { index = "pytorch-cpu" },
@@ -183,6 +184,7 @@ output-format = "grouped"
 line-ending = "lf"
 [tool.ruff.lint]
 # https://docs.astral.sh/ruff/rules/
 select = [ "E4", "E7", "E9", "F" ]
 extend-select = [
  "COM",  # https://docs.astral.sh/ruff/rules/#flake8-commas-com
  "DJ",   # https://docs.astral.sh/ruff/rules/#flake8-django-dj
@@ -56,13 +56,13 @@
      },
      "architect": {
        "build": {
-          "builder": "@angular-builders/custom-webpack:browser",
+          "builder": "@angular/build:application",
          "options": {
-            "customWebpackConfig": {
+            "outputPath": {
-                "path": "./extra-webpack.config.ts"
+              "base": "dist/paperless-ui",
              "browser": ""
            },
-            "outputPath": "dist/paperless-ui",
+            "browser": "src/main.ts",
            "main": "src/main.ts",
            "outputHashing": "none",
            "index": "src/index.html",
            "polyfills": [
@@ -97,6 +97,7 @@
            "scripts": [],
            "allowedCommonJsDependencies": [
              "file-saver",
              "mime-names",
              "utif"
            ],
            "extractLicenses": false,
@@ -117,11 +118,13 @@
                  "with": "src/environments/environment.prod.ts"
                }
              ],
-              "outputPath": "../src/documents/static/frontend/",
+              "outputPath": {
                "base": "../src/documents/static/frontend/",
                "browser": ""
              },
              "optimization": true,
              "outputHashing": "none",
              "sourceMap": false,
              "namedChunks": false,
              "extractLicenses": true,
              "budgets": [
                {
@@ -145,7 +148,7 @@
          "defaultConfiguration": ""
        },
        "serve": {
-          "builder": "@angular-builders/custom-webpack:dev-server",
+          "builder": "@angular/build:dev-server",
          "options": {
            "buildTarget": "paperless-ui:build:en-US"
          },
@@ -156,7 +159,7 @@
          }
        },
        "extract-i18n": {
-          "builder": "@angular-builders/custom-webpack:extract-i18n",
+          "builder": "@angular/build:extract-i18n",
          "options": {
            "buildTarget": "paperless-ui:build"
          }
@@ -1,24 +0,0 @@
 import {
  CustomWebpackBrowserSchema,
  TargetOptions,
 } from '@angular-builders/custom-webpack'
 import * as webpack from 'webpack'
 const { codecovWebpackPlugin } = require('@codecov/webpack-plugin')
 export default (
  config: webpack.Configuration,
  options: CustomWebpackBrowserSchema,
  targetOptions: TargetOptions
 ) => {
  if (config.plugins) {
    config.plugins.push(
      codecovWebpackPlugin({
        enableBundleAnalysis: process.env.CODECOV_TOKEN !== undefined,
        bundleName: 'paperless-ngx',
        uploadToken: process.env.CODECOV_TOKEN,
      })
    )
  }
  return config
 }
@@ -1,6 +1,6 @@
 {
  "name": "paperless-ngx-ui",
-  "version": "3.0.4",
+  "version": "3.0.5",
  "scripts": {
    "preinstall": "npx only-allow pnpm",
    "ng": "ng",
@@ -11,20 +11,21 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/cdk": "^22.0.3",
+    "@angular/cdk": "^22.1.1",
-    "@angular/common": "~22.0.5",
+    "@angular/common": "~22.1.1",
-    "@angular/compiler": "~22.0.5",
+    "@angular/compiler": "~22.1.1",
-    "@angular/core": "~22.0.5",
+    "@angular/core": "~22.1.1",
-    "@angular/forms": "~22.0.5",
+    "@angular/forms": "~22.1.1",
-    "@angular/localize": "~22.0.5",
+    "@angular/localize": "~22.1.1",
-    "@angular/platform-browser": "~22.0.5",
+    "@angular/platform-browser": "~22.1.1",
-    "@angular/router": "~22.0.5",
+    "@angular/router": "~22.1.1",
    "@ng-bootstrap/ng-bootstrap": "^21.0.0",
-    "@ng-select/ng-select": "^23.2.0",
+    "@ng-select/ng-select": "~23.6.0",
    "@ngneat/dirty-check-forms": "^3.0.3",
    "@popperjs/core": "^2.11.8",
    "bootstrap": "^5.3.8",
    "file-saver": "^2.0.5",
    "lodash-es": "^4.18.1",
    "mime-names": "^1.0.0",
    "ngx-bootstrap-icons": "^1.9.3",
    "ngx-color": "^10.1.0",
@@ -32,42 +33,40 @@
    "ngx-device-detector": "^12.0.0",
    "ngx-ui-tour-ng-bootstrap": "^19.0.0",
    "normalize-diacritics": "^5.0.0",
-    "pdfjs-dist": "^6.0.227",
+    "pdfjs-dist": "^6.2.108",
    "rxjs": "^7.8.2",
    "tslib": "^2.8.1",
    "utif": "^3.1.0",
    "uuid": "^14.0.1"
  },
  "devDependencies": {
    "@angular-builders/custom-webpack": "^22.0.1",
    "@angular-builders/jest": "^22.0.1",
-    "@angular-devkit/core": "^22.0.5",
+    "@angular-devkit/core": "^22.1.3",
-    "@angular-devkit/schematics": "^22.0.5",
+    "@angular-devkit/schematics": "^22.1.3",
-    "@angular-eslint/builder": "22.0.0",
+    "@angular-eslint/builder": "22.1.0",
-    "@angular-eslint/eslint-plugin": "22.0.0",
+    "@angular-eslint/eslint-plugin": "22.1.0",
-    "@angular-eslint/eslint-plugin-template": "22.0.0",
+    "@angular-eslint/eslint-plugin-template": "22.1.0",
-    "@angular-eslint/schematics": "22.0.0",
+    "@angular-eslint/schematics": "22.1.0",
-    "@angular-eslint/template-parser": "22.0.0",
+    "@angular-eslint/template-parser": "22.1.0",
-    "@angular/build": "^22.0.5",
+    "@angular/build": "22.1.3",
-    "@angular/cli": "~22.0.5",
+    "@angular/cli": "22.1.3",
-    "@angular/compiler-cli": "~22.0.5",
+    "@angular/compiler-cli": "~22.1.1",
-    "@codecov/webpack-plugin": "^2.0.1",
+    "@playwright/test": "^1.62.1",
    "@playwright/test": "^1.61.1",
    "@types/jest": "^30.0.0",
-    "@types/node": "^26.0.0",
+    "@types/node": "^26.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.62.0",
+    "@typescript-eslint/eslint-plugin": "^8.67.0",
-    "@typescript-eslint/parser": "^8.62.0",
+    "@typescript-eslint/parser": "^8.67.0",
-    "@typescript-eslint/utils": "^8.62.0",
+    "@typescript-eslint/utils": "^8.67.0",
-    "eslint": "^10.5.0",
+    "eslint": "^10.8.1",
    "jest": "30.4.2",
    "jest-environment-jsdom": "^30.4.1",
    "jest-junit": "^17.0.0",
    "jest-preset-angular": "^17.0.0",
    "jest-websocket-mock": "^2.5.0",
    "prettier": "^3.9.6",
    "prettier-plugin-organize-imports": "^4.3.0",
-    "ts-node": "~10.9.1",
+    "ts-node": "~10.9.2",
-    "typescript": "^6.0.3",
+    "typescript": "^6.0.3"
    "webpack": "^5.107.2"
  },
-  "packageManager": "pnpm@10.26.0"
+  "packageManager": "pnpm@11.15.1"
 }
@@ -5,6 +5,8 @@ trustPolicy: no-downgrade
 trustPolicyExclude:
  - "chokidar@4.0.3"
  - "semver@6.3.1 || 5.7.2"
 blockExoticSubdeps: true
 autoInstallPeers: false
 allowBuilds:
  "@parcel/watcher": true
  canvas: true
@@ -21,7 +21,7 @@
  </div>
 </pngx-page-header>
-@if (!tasksService.completedFileTasks && tasksService.loading) {
+@if (loading() && pagedTasks().length === 0) {
  <div class="spinner-border spinner-border-sm fw-normal ms-2 me-auto" role="status"></div>
  <div class="visually-hidden" i18n>Loading...</div>
 }
@@ -576,7 +576,7 @@ describe('TasksComponent', () => {
    expect(dismissSpy).toHaveBeenCalledWith(new Set([tasks[0].id, tasks[1].id]))
    expect(toastSpy).toHaveBeenCalledWith('Error dismissing tasks', error)
-    expect(modal.componentInstance.buttonsEnabled).toBe(true)
+    expect(modal.componentInstance.buttonsEnabled()).toBe(true)
    expect(component.selectedTasks.size).toBe(0)
  })
@@ -642,7 +642,7 @@ describe('TasksComponent', () => {
    expect(dismissSpy).toHaveBeenCalled()
    expect(toastSpy).toHaveBeenCalledWith('Error dismissing tasks', error)
-    expect(modal.componentInstance.buttonsEnabled).toBe(true)
+    expect(modal.componentInstance.buttonsEnabled()).toBe(true)
  })
  it('should dismiss the currently visible scoped and filtered tasks', () => {
@@ -316,7 +316,7 @@ export class TasksComponent
      modal.componentInstance.btnClass = 'btn-warning'
      modal.componentInstance.btnCaption = $localize`Dismiss`
      modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-        modal.componentInstance.buttonsEnabled = false
+        modal.componentInstance.buttonsEnabled.set(false)
        modal.close()
        this.tasksService.dismissTasks(tasks).subscribe({
          next: () => {
@@ -324,7 +324,7 @@ export class TasksComponent
          },
          error: (e) => {
            this.toastService.showError($localize`Error dismissing tasks`, e)
-            modal.componentInstance.buttonsEnabled = true
+            modal.componentInstance.buttonsEnabled.set(true)
          },
        })
        this.clearSelection()
@@ -350,7 +350,7 @@ export class TasksComponent
    modal.componentInstance.btnClass = 'btn-warning'
    modal.componentInstance.btnCaption = $localize`Dismiss`
    modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-      modal.componentInstance.buttonsEnabled = false
+      modal.componentInstance.buttonsEnabled.set(false)
      modal.close()
      this.tasksService.dismissAllTasks().subscribe({
        next: () => {
@@ -358,7 +358,7 @@ export class TasksComponent
        },
        error: (e) => {
          this.toastService.showError($localize`Error dismissing tasks`, e)
-          modal.componentInstance.buttonsEnabled = true
+          modal.componentInstance.buttonsEnabled.set(true)
        },
      })
      this.clearSelection()
@@ -2,3 +2,8 @@
 .d-block.d-sm-none .dropdown-toggle::after {
  display: none;
 }
 tbody tr:last-child td,
 table:not(:has(tbody tr)) thead th {
  border-bottom: none;
 }
@@ -82,7 +82,7 @@ export class TrashComponent
    modal.componentInstance.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        modal.componentInstance.buttonsEnabled = false
+        modal.componentInstance.buttonsEnabled.set(false)
        this.trashService.emptyTrash([document.id]).subscribe({
          next: () => {
            this.toastService.showInfo(
@@ -146,7 +146,7 @@ export class UsersAndGroupsComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled = false
+      modal.componentInstance.buttonsEnabled.set(false)
      this.usersService.delete(user).subscribe({
        next: () => {
          modal.close()
@@ -199,7 +199,7 @@ export class UsersAndGroupsComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled = false
+      modal.componentInstance.buttonsEnabled.set(false)
      this.groupsService.delete(group).subscribe({
        next: () => {
          modal.close()
@@ -104,14 +104,14 @@
            </h6>
            <ul class="nav flex-column mb-2" cdkDropList (cdkDropListDropped)="onDrop($event)">
              @for (view of savedViewService.sidebarViews; track view.id) {
-                <li class="nav-item w-100 app-link" cdkDrag [cdkDragDisabled]="!settingsService.organizingSidebarSavedViews()"
+                <li class="nav-item w-100 app-link" cdkDrag [cdkDragDisabled]="!settingsService.organizingSidebarSavedViews() || !canSaveSettings"
                  cdkDragPreviewContainer="parent" cdkDragPreviewClass="navItemDrag" (cdkDragStarted)="onDragStart($event)"
                  (cdkDragEnded)="onDragEnd($event)">
                  <a class="nav-link" routerLink="view/{{view.id}}"
                    routerLinkActive="active" (click)="closeMenu()" [ngbPopover]="view.name"
                    [disablePopover]="!slimSidebarEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
                    popoverClass="popover-slim">
-                    <i-bs class="me-2" name="funnel"></i-bs><span><div class="d-inline-flex view-name"><span class="overflow-hidden" [class.text-wrap]="!slimSidebarEnabled">{{view.name}}</span></div>
+                    <i-bs class="me-2" [name]="view.icon || 'funnel'"></i-bs><span><div class="d-inline-flex view-name"><span class="overflow-hidden" [class.text-wrap]="!slimSidebarEnabled">{{view.name}}</span></div>
                        @if (showSidebarCounts && !slimSidebarEnabled) {
                          <span class="badge bg-info text-dark ms-2 d-inline">{{ savedViewService.getDocumentCount(view) }}</span>
                        }
@@ -120,7 +120,7 @@
                      <span class="badge bg-info text-dark position-absolute top-0 end-0 d-none d-md-block">{{ savedViewService.getDocumentCount(view) }}</span>
                    }
                  </a>
-                  @if (settingsService.organizingSidebarSavedViews()) {
+                  @if (settingsService.organizingSidebarSavedViews() && canSaveSettings) {
                    <div class="position-absolute end-0 top-0 px-3 py-2" [class.me-n3]="slimSidebarEnabled" cdkDragHandle>
                      <i-bs name="grip-vertical"></i-bs>
                    </div>
@@ -182,7 +182,7 @@
                    container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                    <i-bs class="me-2" name="stack"></i-bs><span><ng-container i18n>Attributes</ng-container></span>
                  </a>
-                  @if (!slimSidebarEnabled) {
+                  @if (!slimSidebarEnabled && canSaveSettings) {
                    <button
                      type="button"
                      class="btn btn-link btn-sm text-muted p-0 me-3 attributes-expand-btn"
@@ -195,32 +195,32 @@
                  }
                </div>
                <div
-                  class="attributes-submenu ms-2"
+                  class="attributes-submenu ms-3"
                  [ngbCollapse]="slimSidebarEnabled || attributesSectionsCollapsed"
                >
                  <ul class="nav flex-column">
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Tag }">
-                      <a class="nav-link py-1" routerLink="attributes/tags" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link" routerLink="attributes/tags" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="tags"></i-bs><span><ng-container i18n>Tags</ng-container></span>
                      </a>
                    </li>
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Correspondent }">
-                      <a class="nav-link py-1" routerLink="attributes/correspondents" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link" routerLink="attributes/correspondents" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="person"></i-bs><span><ng-container i18n>Correspondents</ng-container></span>
                      </a>
                    </li>
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.DocumentType }">
-                      <a class="nav-link py-1" routerLink="attributes/documenttypes" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link" routerLink="attributes/documenttypes" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="hash"></i-bs><span><ng-container i18n>Document types</ng-container></span>
                      </a>
                    </li>
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.StoragePath }">
-                      <a class="nav-link py-1" routerLink="attributes/storagepaths" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link" routerLink="attributes/storagepaths" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="folder"></i-bs><span><ng-container i18n>Storage paths</ng-container></span>
                      </a>
                    </li>
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.CustomField }">
-                      <a class="nav-link py-1" routerLink="attributes/customfields" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link" routerLink="attributes/customfields" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="ui-radios"></i-bs><span><ng-container i18n>Custom fields</ng-container></span>
                      </a>
                    </li>
@@ -19,6 +19,11 @@
    height: 0.8em;
  }
  .sidebar-heading,
  .text-uppercase {
    letter-spacing: 0.06em;
  }
  .view-name {
    max-width: calc(100% - 50px)
  }
@@ -47,11 +52,12 @@
  .search-container {
    max-height: 4.5rem;
-    overflow: hidden;
+    overflow: visible;
    transition: max-height .2s ease, opacity .2s ease, padding-top .2s ease, padding-bottom .2s ease;
    &.mobile-hidden {
      max-height: 0;
      overflow: hidden;
      opacity: 0;
      padding-top: 0 !important;
      padding-bottom: 0 !important;
@@ -80,7 +86,7 @@ main {
 .sidebar li.nav-item span,
 .sidebar .sidebar-heading span {
-  transition: all .1s ease;
+  transition: opacity .1s ease;
 }
@media(min-width: 768px) {
@@ -148,7 +154,7 @@ main {
    z-index: 996;
    --bs-btn-padding-x: 0.35rem;
    --bs-btn-padding-y: 0.125rem;
-    transition: all .2s ease;
+    transition: left .2s ease;
  }
  .sidebar.slim .sidebar-slim-toggler {
@@ -180,6 +186,8 @@ main {
 .sidebar .nav-link {
  font-weight: 500;
  white-space: nowrap;
  border-left: 2px solid transparent;
  transition: color .15s ease-in-out;
  &:hover, &.active, &:focus {
    color: var(--bs-primary);
@@ -192,6 +200,7 @@ main {
  &.active {
    font-weight: bold;
    border-left-color: var(--bs-primary);
  }
  i-bs {
@@ -200,6 +209,17 @@ main {
  }
 }
 // sub-page gets marker only
 .nav-item:has(.attributes-submenu.show .nav-link.active) > .attributes-row > .nav-link.active {
  border-left-color: transparent;
 }
 // bring sub-menu markers back out to L edge
 .attributes-submenu .nav-link {
  margin-left: -1rem;
  padding-left: calc(var(--bs-nav-link-padding-x) + 1rem);
 }
 .attributes-row .attributes-expand-btn {
  opacity: 0.2;
  transition: opacity 0.15s ease-in-out;
@@ -12,10 +12,10 @@
  }
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">
+  <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">
        <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
      </button>
-  <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled">
+  <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled()">
    <span>
      {{btnCaption}}
      <span class="visually-hidden">{{ seconds | number: '1.0-0' }} seconds</span>
@@ -25,7 +25,7 @@
    }
  </button>
  @if (alternativeBtnCaption) {
-    <button type="button" class="btn" [class]="alternativeBtnClass" (click)="alternative()" [disabled]="!alternativeButtonEnabled || !buttonsEnabled">
+    <button type="button" class="btn" [class]="alternativeBtnClass" (click)="alternative()" [disabled]="!alternativeButtonEnabled || !buttonsEnabled()">
      {{alternativeBtnCaption}}
    </button>
  }
@@ -64,6 +64,22 @@ describe('ConfirmDialogComponent', () => {
    expect(confirmSubjectResult).toBeTruthy()
  })
  it('should re-render the buttons when they are toggled from outside', async () => {
    const confirmButton: HTMLButtonElement =
      fixture.nativeElement.querySelectorAll('.modal-footer button')[1]
    expect(confirmButton.disabled).toBeFalsy()
    // Deliberately no detectChanges: a request callback toggling this is all
    // that happens, and nothing else schedules a render for the modal
    component.buttonsEnabled.set(false)
    await fixture.whenStable()
    expect(confirmButton.disabled).toBeTruthy()
    component.buttonsEnabled.set(true)
    await fixture.whenStable()
    expect(confirmButton.disabled).toBeFalsy()
  })
  it('should support cancel & close modal', () => {
    let confirmSubjectResult
    const closeModalSpy = jest.spyOn(modal, 'close')
@@ -1,5 +1,12 @@
 import { DecimalPipe } from '@angular/common'
-import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
+import {
  Component,
  EventEmitter,
  Input,
  Output,
  inject,
  signal,
 } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { Subject } from 'rxjs'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
@@ -46,8 +53,7 @@ export class ConfirmDialogComponent extends LoadingComponentWithPermissions {
  @Input()
  cancelBtnCaption = $localize`Cancel`
-  @Input()
+  readonly buttonsEnabled = signal(true)
  buttonsEnabled = true
  confirmButtonEnabled = true
  alternativeButtonEnabled = true
@@ -0,0 +1,58 @@
 <div class="modal-header">
  <h4 class="modal-title" id="modal-basic-title">{{title}}</h4>
  <button type="button" class="btn-close" aria-label="Close" (click)="cancel()"></button>
 </div>
 <div class="modal-body">
  <p>{{message}}</p>
  <div class="form-group">
    <label class="form-label" for="rootDocumentID" i18n>Root document:</label>
    <select id="rootDocumentID" class="form-select" [ngModel]="rootDocumentID()" (ngModelChange)="rootDocumentID.set($event)">
      @for (document of documents(); track document.id) {
        <option [ngValue]="document.id">{{document.title}}</option>
      }
    </select>
  </div>
  <div class="form-group mt-4">
    <span class="form-label d-inline-block" i18n>Versions (oldest first):</span>
    <ul class="list-group"
        cdkDropList
        [cdkDropListData]="versionDocumentIDs()"
        (cdkDropListDropped)="onDrop($event)">
      @for (documentID of versionDocumentIDs(); track documentID) {
        @let document = getDocument(documentID);
        @if (document) {
          <li class="list-group-item d-flex align-items-center" 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>
            @if ($last) {
              <span class="badge bg-primary ms-auto" i18n>Current version</span>
            }
          </li>
        }
      }
    </ul>
    @if (versionDocumentIDs().length > 1) {
      <div class="form-text" i18n>Drag to reorder.</div>
    }
  </div>
 </div>
 <div class="modal-footer">
  <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">
    <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
  </button>
  <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled()">
    {{btnCaption}}
  </button>
 </div>
@@ -0,0 +1,3 @@
 .list-group-item {
    cursor: move;
 }
@@ -0,0 +1,70 @@
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 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 { of } from 'rxjs'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { MergeAsVersionsConfirmDialogComponent } from './merge-as-versions-confirm-dialog.component'
 describe('MergeAsVersionsConfirmDialogComponent', () => {
  let component: MergeAsVersionsConfirmDialogComponent
  let fixture: ComponentFixture<MergeAsVersionsConfirmDialogComponent>
  let documentService: DocumentService
  beforeEach(async () => {
    await TestBed.configureTestingModule({
      imports: [
        NgxBootstrapIconsModule.pick(allIcons),
        MergeAsVersionsConfirmDialogComponent,
      ],
      providers: [
        NgbActiveModal,
        provideHttpClient(withInterceptorsFromDi()),
        provideHttpClientTesting(),
      ],
    }).compileComponents()
    fixture = TestBed.createComponent(MergeAsVersionsConfirmDialogComponent)
    documentService = TestBed.inject(DocumentService)
    component = fixture.componentInstance
    fixture.detectChanges()
  })
  it('should fetch selected documents', () => {
    const documents = [
      { id: 1, title: 'Document 1' },
      { id: 2, title: 'Document 2' },
    ]
    jest.spyOn(documentService, 'getFew').mockReturnValue(
      of({
        all: [1, 2],
        count: 2,
        results: documents,
      })
    )
    component.documentIDs.set([1, 2])
    component.ngOnInit()
    expect(component.documents()).toEqual(documents)
    expect(documentService.getFew).toHaveBeenCalledWith([1, 2])
  })
  it('should exclude the root from the draggable documents', () => {
    component.documentIDs.set([1, 2, 3])
    component.rootDocumentID.set(2)
    expect(component.versionDocumentIDs()).toEqual([1, 3])
  })
  it('should move draggable documents while keeping the root fixed', () => {
    component.documentIDs.set([1, 2, 3])
    component.rootDocumentID.set(1)
    component.onDrop({ previousIndex: 1, currentIndex: 0 } as any)
    expect(component.documentIDs()).toEqual([1, 3, 2])
    expect(component.versionDocumentIDs()).toEqual([3, 2])
  })
 })
@@ -0,0 +1,70 @@
 import {
  CdkDragDrop,
  DragDropModule,
  moveItemInArray,
 } from '@angular/cdk/drag-drop'
 import { AsyncPipe } from '@angular/common'
 import { Component, OnInit, computed, inject, signal } from '@angular/core'
 import { FormsModule } 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 { DocumentService } from 'src/app/services/rest/document.service'
 import { ConfirmDialogComponent } from '../confirm-dialog.component'
@Component({
  selector: 'pngx-merge-as-versions-confirm-dialog',
  templateUrl: './merge-as-versions-confirm-dialog.component.html',
  styleUrl: './merge-as-versions-confirm-dialog.component.scss',
  imports: [
    AsyncPipe,
    CorrespondentNamePipe,
    CustomDatePipe,
    DragDropModule,
    FormsModule,
    NgxBootstrapIconsModule,
  ],
 })
 export class MergeAsVersionsConfirmDialogComponent
  extends ConfirmDialogComponent
  implements OnInit
 {
  private readonly documentService = inject(DocumentService)
  readonly documentIDs = signal<number[]>([])
  readonly documents = signal<Document[]>([])
  readonly rootDocumentID = signal(-1)
  readonly versionDocumentIDs = computed(() =>
    this.documentIDs().filter(
      (documentID) => documentID !== this.rootDocumentID()
    )
  )
  ngOnInit() {
    this.documentService
      .getFew(this.documentIDs())
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe((response) => this.documents.set(response.results))
  }
  onDrop(event: CdkDragDrop<number[]>) {
    const versionDocumentIDs = this.versionDocumentIDs().concat()
    moveItemInArray(versionDocumentIDs, event.previousIndex, event.currentIndex)
    // The root keeps its place in the list, only the versions move around it
    let versionIndex = 0
    this.documentIDs.update((documentIDs) =>
      documentIDs.map((documentID) =>
        documentID === this.rootDocumentID()
          ? documentID
          : versionDocumentIDs[versionIndex++]
      )
    )
  }
  getDocument(documentID: number): Document | undefined {
    return this.documents().find((document) => document.id === documentID)
  }
 }
@@ -36,7 +36,7 @@
        </div>
    <div class="form-group mt-4">
        <label class="form-label" for="metadataDocumentID" i18n>Use metadata from:</label>
-        <select class="form-select" [ngModel]="metadataDocumentID()" (ngModelChange)="metadataDocumentID.set($event)">
+        <select id="metadataDocumentID" class="form-select" [ngModel]="metadataDocumentID()" (ngModelChange)="metadataDocumentID.set($event)">
            <option [ngValue]="-1" i18n>Regenerate all metadata</option>
            @for (document of documents(); track document.id) {
              <option [ngValue]="document.id">{{document.title}}</option>
@@ -56,10 +56,10 @@
    }
 </div>
 <div class="modal-footer">
-    <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">
+    <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">
        <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
    </button>
-    <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled">
+    <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled()">
        {{btnCaption}}
    </button>
 </div>
@@ -57,7 +57,7 @@
    class="btn"
    [class]="cancelBtnClass"
    (click)="cancel()"
-    [disabled]="!buttonsEnabled"
+    [disabled]="!buttonsEnabled()"
  >
    <span class="d-inline-block" style="padding-bottom: 1px;">
      {{cancelBtnCaption}}
@@ -68,7 +68,7 @@
    class="btn"
    [class]="btnClass"
    (click)="confirm()"
-    [disabled]="!confirmButtonEnabled || !buttonsEnabled"
+    [disabled]="!confirmButtonEnabled || !buttonsEnabled()"
  >
    {{btnCaption}}
  </button>
@@ -34,10 +34,10 @@
          <p class="mb-0 small"><b>{{messageBold}}</b></p>
        }
    </div>
-    <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">
+    <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">
        <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
    </button>
-    <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled || degrees === 0">
+    <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled() || degrees === 0">
      {{btnCaption}}
      @if (!confirmButtonEnabled) {
          <ngb-progressbar style="height: 1px;" type="dark" [max]="secondsTotal" [value]="seconds"></ngb-progressbar>
@@ -68,6 +68,11 @@
    ></ng-select>
  } @else if (getCustomFieldByID(atom.field)?.data_type === CustomFieldDataType.DocumentLink) {
    <pngx-input-document-link [(ngModel)]="atom.value" class="w-25 form-select doc-link-select p-0" placeholder="Search docs..." i18n-placeholder [minimal]="true"></pngx-input-document-link>
  } @else if (getCustomFieldByID(atom.field)?.data_type === CustomFieldDataType.Monetary) {
    <input class="w-25 form-control rounded-end" type="text" inputmode="decimal"
      [ngModel]="atom.value"
      (ngModelChange)="setMonetaryValue(atom, $event)"
      [disabled]="disabled">
  } @else {
    <input class="w-25 form-control rounded-end" type="text" [(ngModel)]="atom.value" [disabled]="disabled">
  }
@@ -1,5 +1,6 @@
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { LOCALE_ID } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
@@ -41,6 +42,12 @@ const customFields = [
      ],
    },
  },
  {
    id: 3,
    name: 'Test Monetary Field',
    data_type: CustomFieldDataType.Monetary,
    extra_data: { default_currency: 'EUR' },
  },
 ]
 describe('CustomFieldsQueryDropdownComponent', () => {
@@ -61,6 +68,7 @@ describe('CustomFieldsQueryDropdownComponent', () => {
      providers: [
        provideHttpClient(withInterceptorsFromDi()),
        provideHttpClientTesting(),
        { provide: LOCALE_ID, useValue: 'de' },
      ],
    }).compileComponents()
@@ -150,6 +158,22 @@ describe('CustomFieldsQueryDropdownComponent', () => {
    expect(options2).toEqual([])
  })
  it('should normalize localized monetary comparison values', () => {
    const atom = new CustomFieldQueryAtom([3, 'exact', null])
    component.setMonetaryValue(atom, '1.234,56')
    expect(atom.value).toEqual('1234.56')
  })
  it('should preserve API-formatted monetary comparison values', () => {
    const atom = new CustomFieldQueryAtom([3, 'exact', null])
    component.setMonetaryValue(atom, '1234.56')
    expect(atom.value).toEqual('1234.56')
  })
  it('should remove an element from the selection model', () => {
    const expression = new CustomFieldQueryExpression()
    const atom = new CustomFieldQueryAtom()
@@ -1,9 +1,14 @@
-import { NgTemplateOutlet } from '@angular/common'
+import {
  getLocaleNumberSymbol,
  NgTemplateOutlet,
  NumberSymbol,
 } from '@angular/common'
 import {
  Component,
  EventEmitter,
  inject,
  Input,
  LOCALE_ID,
  Output,
  QueryList,
  signal,
@@ -212,6 +217,7 @@ export class CustomFieldQueriesModel {
 })
 export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPermissions {
  protected customFieldsService = inject(CustomFieldsService)
  private readonly locale = inject(LOCALE_ID)
  public CustomFieldQueryComponentType = CustomFieldQueryElementType
  public CustomFieldQueryOperator = CustomFieldQueryOperator
@@ -376,4 +382,18 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
    }
    return []
  }
  setMonetaryValue(atom: CustomFieldQueryAtom, value: string) {
    // Normalize the decimal symbol e.g. . vs , by locale
    const decimalSymbol = getLocaleNumberSymbol(
      this.locale,
      NumberSymbol.Decimal
    )
    if (decimalSymbol !== '.' && value.includes(decimalSymbol)) {
      const groupSymbol = getLocaleNumberSymbol(this.locale, NumberSymbol.Group)
      value = value.split(groupSymbol).join('').split(decimalSymbol).join('.')
    }
    atom.value = value
  }
 }
@@ -32,6 +32,8 @@ import { EditDialogComponent, EditDialogMode } from './edit-dialog.component'
  template: `
    <div>
      <h4 class="modal-title" id="modal-basic-title">{{ getTitle() }}</h4>
      <span class="error">{{ error?.name }}</span>
      <button [disabled]="networkActive" (click)="save()">Save</button>
    </div>
  `,
  imports: [FormsModule, ReactiveFormsModule],
@@ -276,4 +278,22 @@ describe('EditDialogComponent', () => {
    expect(failedSpy).toHaveBeenCalled()
    expect(component.error).toEqual('error')
  })
  it('should update the view after a failed save', async () => {
    const button: HTMLButtonElement =
      fixture.nativeElement.querySelector('button')
    button.click()
    await fixture.whenStable()
    expect(button.disabled).toBe(true)
    httpTestingController
      .expectOne(`${environment.apiBaseUrl}tags/`)
      .flush({ name: ['Name is required.'] }, { status: 400, statusText: '' })
    await fixture.whenStable()
    expect(button.disabled).toBe(false)
    expect(fixture.nativeElement.querySelector('.error').textContent).toContain(
      'Name is required.'
    )
  })
 })
@@ -1,4 +1,5 @@
 import {
  ChangeDetectorRef,
  Directive,
  EventEmitter,
  Input,
@@ -45,6 +46,7 @@ export abstract class EditDialogComponent<
  protected userService = inject(UserService)
  protected settingsService = inject(SettingsService)
  protected permissionsService = inject(PermissionsService)
  protected changeDetector = inject(ChangeDetectorRef)
  dialogMode = model(EditDialogMode.CREATE)
@@ -108,10 +110,12 @@ export abstract class EditDialogComponent<
    // wait to enable close button so it doesn't steal focus from input since its the first clickable element in the DOM
    setTimeout(() => {
      this.closeEnabled = true
      this.changeDetector.markForCheck()
    })
    this.userService.listAll().subscribe((r) => {
      this.users = r.results
      this.changeDetector.markForCheck()
    })
  }
@@ -191,6 +195,7 @@ export abstract class EditDialogComponent<
        this.error = error.error
        this.networkActive = false
        this.failed.next(error)
        this.changeDetector.markForCheck()
      },
    })
  }
@@ -1019,4 +1019,28 @@ describe('WorkflowEditDialogComponent', () => {
      'pass3',
    ])
  })
  it('should parse passwords again when retrying a failed save', () => {
    component.object = {
      name: 'Workflow with blank Passwords',
      id: 1,
      order: null,
      enabled: true,
      triggers: [],
      actions: [
        {
          id: 1,
          type: WorkflowActionType.PasswordRemoval,
          passwords: [],
        },
      ],
    }
    component.ngOnInit()
    component.save()
    component.objectForm.get('order').setValue(1)
    expect(() => component.save()).not.toThrow()
    expect(component.objectForm.get('actions').value[0].passwords).toEqual([])
  })
 })
@@ -1207,9 +1207,8 @@ export class WorkflowEditDialogComponent
    return passwords.join('\n')
  }
-  private parsePasswords(value: string = ''): string[] {
+  private parsePasswords(value: string | string[] = ''): string[] {
-    return value
+    return (Array.isArray(value) ? value : value.split(/[\n,]+/))
      .split(/[\n,]+/)
      .map((entry) => entry.trim())
      .filter((entry) => entry.length > 0)
  }
@@ -1,4 +1,4 @@
-<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown" (keydown)="listKeyDown($event)" [popperOptions]="popperOptions">
+<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown" (keydown)="listKeyDown($event)" [popperOptions]="popperOptions" [autoClose]="!creating()">
  <button class="btn btn-sm" id="dropdown_{{name}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled">
    <i-bs name="{{icon}}"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
    @if (!editing && selectionModel.totalCount > 0) {
@@ -49,7 +49,7 @@
        </cdk-virtual-scroll-viewport>
      }
      @if (editing) {
-        @if (filteredItems.length === 0 && createRef !== undefined) {
+        @if (filteredItems.length === 0 && createRef !== undefined && filterText?.length > 0) {
          <button class="list-group-item list-group-item-action bg-light" (click)="createClicked()" [disabled]="disabled">
            <small class="ms-2"><ng-container i18n>Create</ng-container> "{{filterText}}"</small>
            <i-bs width="1.5em" height="1em" name="plus"></i-bs>
@@ -62,7 +62,7 @@
          </button>
        }
      }
-      @if (extraButtonTitle) {
+      @if (extraButtonTitle && (showExtraButtonIfEmpty || filteredItems?.length > 0)) {
        <button class="list-group-item list-group-item-action bg-light d-flex align-items-center" (click)="extraButtonClicked($event)" [disabled]="disabled">
          <small class="ms-2 fw-bold">{{extraButtonTitle}}</small>
          <i-bs width="1.5em" height="1em" name="arrow-right"></i-bs>
@@ -3,6 +3,7 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { NEVER, Subject } from 'rxjs'
 import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
 import {
  DEFAULT_MATCHING_ALGORITHM,
@@ -48,6 +49,7 @@ const negativeNullItem = {
 let selectionModel: FilterableDropdownSelectionModel
 const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
 const createModalRef = () => ({ closed: NEVER, dismissed: NEVER }) as any
 describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () => {
  let component: FilterableDropdownComponent
@@ -868,7 +870,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    expect(getRootDocCount(rootWithoutCounts.id)).toEqual(0)
  })
-  it('should set support create, keep open model and call createRef method', async () => {
+  it('should keep the dropdown open while the create modal is active', async () => {
    component.selectionModel.items = items
    component.icon = 'tag-fill'
    component.selectionModel = selectionModel
@@ -882,20 +884,44 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    fixture.detectChanges()
    component.filterText = 'Test Filter Text'
-    component.createRef = jest.fn()
+    const modalClosed = new Subject<void>()
    component.createRef = jest.fn(
      () =>
        ({
          closed: modalClosed,
          dismissed: NEVER,
        }) as any
    )
    component.createClicked()
-    expect(component.creating).toBeTruthy()
+    expect(component.creating()).toBeTruthy()
    expect(component.createRef).toHaveBeenCalledWith('Test Filter Text')
    fixture.detectChanges()
    expect(component.dropdown.autoClose).toBeFalsy()
    document.body.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
    document.body.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }))
    await wait(10)
    expect(component.dropdown.isOpen()).toBeTruthy()
    // Also cover a close that was already scheduled before autoClose changed.
    const openSpy = jest.spyOn(component.dropdown, 'open')
    component.dropdownOpenChange(false)
    expect(openSpy).toHaveBeenCalled() // should keep open
    component.dropdownOpenChange(false)
    expect(openSpy).toHaveBeenCalledTimes(2) // modal interactions keep it open
    modalClosed.next()
    fixture.detectChanges()
    expect(component.creating()).toBeFalsy()
    expect(component.dropdown.autoClose).toBeTruthy()
    expect(component.dropdown.isOpen()).toBeTruthy()
  })
  it('should call create on enter inside filter field if 0 items remain while editing', async () => {
    component.selectionModel.items = items
    component.icon = 'tag-fill'
    component.editing = true
-    component.createRef = jest.fn()
+    component.createRef = jest.fn(createModalRef)
    const createSpy = jest.spyOn(component, 'createClicked')
    expect(component.selectionModel.getSelectedItems()).toEqual([])
    fixture.nativeElement
@@ -911,6 +937,25 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    expect(createSpy).toHaveBeenCalled()
  })
  it('should only show create when a non-empty filter has no matches', () => {
    component.selectionModel.items = []
    component.icon = 'tag-fill'
    component.editing = true
    component.createRef = jest.fn(createModalRef)
    fixture.detectChanges()
    expect(fixture.nativeElement.textContent).not.toContain('Create')
    component.listFilterEnter()
    expect(component.createRef).not.toHaveBeenCalled()
    const filterInput: HTMLInputElement =
      fixture.nativeElement.querySelector('input[type="text"]')
    filterInput.value = 'FooBar'
    filterInput.dispatchEvent(new Event('input'))
    fixture.detectChanges()
    expect(fixture.nativeElement.textContent).toContain('Create "FooBar"')
  })
  it('should exclude item and trigger change event', () => {
    const id = 1
    const state = ToggleableItemState.Selected
@@ -970,4 +1015,18 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    expect(extraButtonClicked).toBeTruthy()
    expect(applied).toBeFalsy()
  })
  it('should only show the extra button for an empty result when enabled', () => {
    component.selectionModel.items = items
    component.icon = 'tag-fill'
    component.extraButtonTitle = 'Extra'
    component.filterText = 'FooBar'
    fixture.detectChanges()
    expect(fixture.nativeElement.textContent).not.toContain('Extra')
    fixture.componentRef.setInput('showExtraButtonIfEmpty', true)
    fixture.detectChanges()
    expect(fixture.nativeElement.textContent).toContain('Extra')
  })
 })
@@ -15,9 +15,13 @@ import {
  signal,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
+import {
  NgbDropdown,
  NgbDropdownModule,
  NgbModalRef,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { Subject, filter, takeUntil } from 'rxjs'
+import { Subject, filter, first, merge, 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'
@@ -759,7 +763,7 @@ export class FilterableDropdownComponent
  disabled = false
  @Input()
-  createRef: (name) => void
+  createRef: (name: string) => NgbModalRef
  @Input()
  set documentCounts(counts: SelectionDataItem[]) {
@@ -774,7 +778,10 @@ export class FilterableDropdownComponent
  @Input()
  extraButtonTitle: string
-  creating: boolean = false
+  @Input()
  showExtraButtonIfEmpty: boolean = false
  readonly creating = signal(false)
  @Output()
  apply = new EventEmitter<ChangedItems>()
@@ -851,12 +858,18 @@ export class FilterableDropdownComponent
  }
  createClicked() {
-    this.creating = true
+    this.creating.set(true)
-    this.createRef(this.filterText)
+    const modal = this.createRef(this.filterText)
    merge(modal.closed, modal.dismissed)
      .pipe(first(), takeUntil(this.unsubscribeNotifier))
      .subscribe(() => this.creating.set(false))
  }
  dropdownOpenChange(open: boolean): void {
    if (open) {
      // Dont let a create modal close this
      if (this.creating()) return
      setTimeout(() => {
        this.listFilterTextInput?.nativeElement.focus()
        this.buttonsViewport?.checkViewportSize()
@@ -869,9 +882,8 @@ export class FilterableDropdownComponent
        this.editing && !this.selectionModel.manyToOne
      this.opened.next(this)
    } else {
-      if (this.creating) {
+      if (this.creating()) {
        this.dropdown?.open()
        this.creating = false
      } else {
        this.filterText = ''
        if (this.applyOnClose && this.selectionModel.isDirty()) {
@@ -892,7 +904,11 @@ export class FilterableDropdownComponent
          this.dropdown.close()
        }
      }, 200)
-    } else if (filtered.length == 0 && this.createRef) {
+    } else if (
      filtered.length == 0 &&
      this.createRef &&
      this.filterText?.length > 0
    ) {
      this.createClicked()
    }
  }
@@ -52,10 +52,10 @@ describe('CustomFieldsValuesComponent', () => {
  })
  it('should set selectedFields and map values correctly', () => {
-    component.value = { 1: 'value1' }
+    component.value = { 1: 'value1', 3: 0, 4: false }
-    component.selectedFields = [1, 2]
+    component.selectedFields = [1, 2, 3, 4]
-    expect(component.selectedFields).toEqual([1, 2])
+    expect(component.selectedFields).toEqual([1, 2, 3, 4])
-    expect(component.value).toEqual({ 1: 'value1', 2: null })
+    expect(component.value).toEqual({ 1: 'value1', 2: null, 3: 0, 4: false })
  })
  it('should return the correct custom field by id', () => {
@@ -77,7 +77,7 @@ export class CustomFieldsValuesComponent extends AbstractInputComponent<Object>
    this._selectedFields = newFields
    // map the selected fields to an object with field_id as key and value as value
    this.value = newFields.reduce((acc, fieldId) => {
-      acc[fieldId] = this.value?.[fieldId] || null
+      acc[fieldId] = this.value?.[fieldId] ?? null
      return acc
    }, {})
    this.onChange(this.value)
@@ -36,7 +36,16 @@
          (focus)="clearLastSearchTerm()"
          (clear)="clearLastSearchTerm()"
          (blur)="onBlur()">
          <ng-template ng-label-tmp let-item="item">
            @if (iconField && item[iconField]) {
              <i-bs class="me-2" [name]="item[iconField]"></i-bs>
            }
            <span [title]="item[bindLabel]">{{item[bindLabel]}}</span>
          </ng-template>
          <ng-template ng-option-tmp let-item="item">
              @if (iconField && item[iconField]) {
                <i-bs class="me-2" [name]="item[iconField]"></i-bs>
              }
              <span [title]="item[bindLabel]">{{item[bindLabel]}}</span>
          </ng-template>
        </ng-select>
@@ -35,7 +35,7 @@ import { AbstractInputComponent } from '../abstract-input'
    NgxBootstrapIconsModule,
  ],
 })
-export class SelectComponent extends AbstractInputComponent<number> {
+export class SelectComponent extends AbstractInputComponent<number | string> {
  constructor() {
    super()
    this.addItemRef = this.addItem.bind(this)
@@ -100,6 +100,9 @@ export class SelectComponent extends AbstractInputComponent<number> {
  @Input()
  bindLabel: string = 'name'
  @Input()
  iconField: string
  public searchFn = (term: string, item: any): boolean =>
    matchesSearchText(item?.[this.bindLabel], term)
@@ -100,7 +100,7 @@
      </div>
    }
    <div class="form-group ms-md-auto">
-      <button type="button" class="btn me-2" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">{{ cancelBtnCaption }}</button>
+      <button type="button" class="btn me-2" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">{{ cancelBtnCaption }}</button>
      <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="pages.length === 0">{{ btnCaption }}</button>
    </div>
  </div>
@@ -151,6 +151,13 @@
  inset: 0;
  pointer-events: none;
  & section {
    position: absolute;
    text-align: initial;
    box-sizing: border-box;
    transform-origin: 0 0;
  }
  & .annotationTextContent {
    opacity: 0;
  }
@@ -90,6 +90,7 @@ describe('PngxPdfViewerComponent', () => {
    }
    expect(viewer).toBeInstanceOf(PDFSinglePageViewer)
    expect(viewer.options.textLayerMode).toBe(0)
    expect(viewer.options.enableSelectionRendering).toBe(false)
  })
  it('applies zoom, rotation, and page changes', async () => {
@@ -129,13 +130,25 @@ describe('PngxPdfViewerComponent', () => {
    ;(component as any).applyScale()
    expect(viewer.currentScaleValue).toBe(PdfZoomScale.PageFit)
    expect(viewer.currentScale).toBe(2)
  })
  it('does not reapply scale for page-only changes', async () => {
    await initComponent()
    const pdf = (component as any).pdf as { numPages: number }
    pdf.numPages = 3
    const viewer = (component as any).pdfViewer as PDFViewer
    viewer.setDocument(pdf)
    const applyScaleSpy = jest.spyOn(component as any, 'applyScale')
    component.page = 2
-    ;(component as any).lastViewerPage = 2
+
-    ;(component as any).applyViewerState()
+    component.ngOnChanges({
      page: new SimpleChange(1, 2, false),
    })
    expect(viewer.currentPageNumber).toBe(2)
    expect((component as any).lastViewerPage).toBeUndefined()
-    expect(applyScaleSpy).toHaveBeenCalled()
+    expect(applyScaleSpy).not.toHaveBeenCalled()
  })
  it('does not reset the viewer when it is already on the requested page', async () => {
@@ -13,6 +13,7 @@ import {
  ViewChild,
 } from '@angular/core'
 import {
  AnnotationMode,
  getDocument,
  GlobalWorkerOptions,
  PDFDocumentLoadingTask,
@@ -116,7 +117,10 @@ export class PngxPdfViewerComponent
      changes['zoomScale'] ||
      changes['rotation']
    ) {
-      this.applyViewerState()
+      // Prevent loop with page / scale application see https://github.com/paperless-ngx/paperless-ngx/issues/13404
      this.applyViewerState(
        !!(changes['zoom'] || changes['zoomScale'] || changes['rotation'])
      )
    }
    if (changes['searchQuery']) {
@@ -218,6 +222,8 @@ export class PngxPdfViewerComponent
      linkService: this.linkService,
      findController: this.findController,
      textLayerMode,
      annotationMode: AnnotationMode.ENABLE,
      enableSelectionRendering: false,
      removePageBorders: true,
    }
@@ -240,7 +246,7 @@ export class PngxPdfViewerComponent
    }
  }
-  private applyViewerState(): void {
+  private applyViewerState(applyScale = true): void {
    if (!this.pdfViewer) {
      return
    }
@@ -264,7 +270,7 @@ export class PngxPdfViewerComponent
    if (this.page === this.lastViewerPage) {
      this.lastViewerPage = undefined
    }
-    if (hasPages) {
+    if (hasPages && applyScale) {
      this.applyScale()
    }
    this.dispatchFindIfReady()
@@ -22,7 +22,7 @@
          }
        </div>
        <div class="me-1">
-          <small i18n>My documents</small>
+          <small>{{ownerFilterLabel}}</small>
        </div>
      </button>
      <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-start-0 border-end-0 border-bottom" role="menuitem" (click)="setFilter(OwnerFilterType.NOT_SELF)" [disabled]="disabled">
@@ -32,7 +32,7 @@
          }
        </div>
        <div class="me-1">
-          <small i18n>Shared with me</small>
+          <small>{{ownerExclusionFilterLabel}}</small>
        </div>
      </button>
      <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-start-0 border-end-0 border-bottom" role="menuitem" (click)="setFilter(OwnerFilterType.SHARED_BY_ME)" [disabled]="disabled">
@@ -42,7 +42,7 @@
          }
        </div>
        <div class="me-1">
-          <small i18n>Shared by me</small>
+          <small>{{sharedByFilterLabel}}</small>
        </div>
      </button>
      <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-start-0 border-end-0 border-bottom" role="menuitem" (click)="setFilter(OwnerFilterType.UNOWNED)" [disabled]="disabled">
@@ -94,6 +94,58 @@ describe('PermissionsFilterDropdownComponent', () => {
    expect(component.isActive).toBeTruthy()
  })
  it('should describe concrete user filters honestly', () => {
    component.selectionModel.ownerFilter = OwnerFilterType.SELF
    component.selectionModel.userID = 1
    expect(component.ownerFilterLabel).toEqual('Owned by user1')
    component.selectionModel.ownerFilter = OwnerFilterType.NOT_SELF
    component.selectionModel.excludeUsers = [1]
    expect(component.ownerExclusionFilterLabel).toEqual('Not owned by user1')
    component.selectionModel.ownerFilter = OwnerFilterType.SHARED_BY_ME
    component.selectionModel.userID = 1
    expect(component.sharedByFilterLabel).toEqual('Shared by user1')
  })
  it('should describe concrete filters when usernames are unavailable', () => {
    component.selectionModel.ownerFilter = OwnerFilterType.SELF
    component.selectionModel.userID = 99
    expect(component.ownerFilterLabel).toEqual('Owned by another user')
    component.selectionModel.ownerFilter = OwnerFilterType.NOT_SELF
    component.selectionModel.excludeUsers = [99]
    expect(component.ownerExclusionFilterLabel).toEqual(
      'Not owned by another user'
    )
    component.selectionModel.excludeUsers = [98, 99]
    expect(component.ownerExclusionFilterLabel).toEqual(
      'Not owned by selected users'
    )
    component.selectionModel.ownerFilter = OwnerFilterType.SHARED_BY_ME
    component.selectionModel.userID = 99
    expect(component.sharedByFilterLabel).toEqual('Shared by another user')
  })
  it('should retain relative labels for filters bound to the current user', () => {
    component.selectionModel.userID = currentUserID
    expect(component.ownerFilterLabel).toEqual('My documents')
    expect(component.sharedByFilterLabel).toEqual('Shared by me')
    component.selectionModel.excludeUsers = [currentUserID]
    expect(component.ownerExclusionFilterLabel).toEqual('Shared with me')
  })
  it('should retain relative labels for inactive filter choices', () => {
    component.selectionModel.ownerFilter = OwnerFilterType.NONE
    expect(component.ownerFilterLabel).toEqual('My documents')
    expect(component.ownerExclusionFilterLabel).toEqual('Shared with me')
    expect(component.sharedByFilterLabel).toEqual('Shared by me')
  })
  it('should support reset', () => {
    component.setFilter(OwnerFilterType.OTHERS)
    expect(component.selectionModel.ownerFilter).not.toEqual(
@@ -93,6 +93,55 @@ export class PermissionsFilterDropdownComponent extends ComponentWithPermissions
    )
  }
  get ownerFilterLabel(): string {
    if (
      this.selectionModel?.ownerFilter !== OwnerFilterType.SELF ||
      this.selectionModel?.userID === this.settingsService.currentUser()?.id
    ) {
      return $localize`My documents`
    }
    const username = this.getUsername(this.selectionModel?.userID)
    return username
      ? $localize`Owned by ${username}`
      : $localize`Owned by another user`
  }
  get ownerExclusionFilterLabel(): string {
    const excludedUsers = this.selectionModel?.excludeUsers ?? []
    if (
      this.selectionModel?.ownerFilter !== OwnerFilterType.NOT_SELF ||
      (excludedUsers.length === 1 &&
        excludedUsers[0] === this.settingsService.currentUser()?.id)
    ) {
      return $localize`Shared with me`
    }
    const usernames = excludedUsers
      .map((id) => this.getUsername(id))
      .filter(Boolean)
    if (usernames.length === excludedUsers.length && usernames.length > 0) {
      return $localize`Not owned by ${usernames.join(', ')}`
    }
    return excludedUsers.length === 1
      ? $localize`Not owned by another user`
      : $localize`Not owned by selected users`
  }
  get sharedByFilterLabel(): string {
    if (
      this.selectionModel?.ownerFilter !== OwnerFilterType.SHARED_BY_ME ||
      this.selectionModel?.userID === this.settingsService.currentUser()?.id
    ) {
      return $localize`Shared by me`
    }
    const username = this.getUsername(this.selectionModel?.userID)
    return username
      ? $localize`Shared by ${username}`
      : $localize`Shared by another user`
  }
  constructor() {
    const userService = inject(UserService)
@@ -164,4 +213,8 @@ export class PermissionsFilterDropdownComponent extends ComponentWithPermissions
    }
    this.onChange()
  }
  private getUsername(userID: number): string {
    return this.users().find((user) => user.id === userID)?.username
  }
 }
@@ -17,6 +17,10 @@ const permissions = [
  'view_document',
  'change_document',
  'delete_document',
  'add_sharelinkbundle',
  'view_sharelinkbundle',
  'change_sharelinkbundle',
  'delete_sharelinkbundle',
  'change_tag',
  'view_documenttype',
 ]
@@ -75,6 +79,7 @@ describe('PermissionsSelectComponent', () => {
    component.ngOnInit()
    component.writeValue(permissions)
    expect(component.typesWithAllActions).toContain('Document')
    expect(component.typesWithAllActions).toContain('ShareLinkBundle')
  })
  it('should update checkboxes on permissions set', () => {
@@ -85,6 +90,10 @@ describe('PermissionsSelectComponent', () => {
    expect(input1.nativeElement.checked).toBeTruthy()
    const input2 = fixture.debugElement.query(By.css('input#Tag_Change'))
    expect(input2.nativeElement.checked).toBeTruthy()
    const bundleInput = fixture.debugElement.query(
      By.css('input#ShareLinkBundle_Add')
    )
    expect(bundleInput.nativeElement.checked).toBeTruthy()
  })
  it('disable checkboxes when permissions are inherited', () => {
@@ -119,7 +119,7 @@
        type="button"
        class="btn btn-primary btn-sm d-inline-flex align-items-center gap-2 text-nowrap"
        (click)="submit()"
-        [disabled]="loading() || !buttonsEnabled">
+        [disabled]="loading() || !buttonsEnabled()">
        @if (loading()) {
          <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
        }
@@ -69,7 +69,7 @@ describe('ShareLinkBundleDialogComponent', () => {
      file_version: FileVersion.Original,
      expiration_days: 3,
    })
-    expect(component.buttonsEnabled).toBe(false)
+    expect(component.buttonsEnabled()).toBe(false)
    expect(confirmSpy).toHaveBeenCalled()
    component.form.setValue({
@@ -78,7 +78,7 @@ export class ShareLinkBundleDialogComponent extends ConfirmDialogComponent {
        : FileVersion.Original,
      expiration_days: this.form.value.expirationDays,
    }
-    this.buttonsEnabled = false
+    this.buttonsEnabled.set(false)
    super.confirm()
  }
@@ -2,10 +2,16 @@
  <button type="button" class="btn btn-sm btn-outline-primary" (click)="clickSuggest()" [disabled]="disabled() || loading() || (suggestions() && !aiEnabled())">
    @if (loading()) {
      <div class="spinner-border spinner-border-sm" role="status"></div>
    } @else if (noSuggestions) {
      <i-bs width="1.2em" height="1.2em" name="check-circle"></i-bs>
    } @else {
      <i-bs width="1.2em" height="1.2em" name="stars"></i-bs>
    }
-    <span class="d-none d-lg-inline ps-1" i18n>Suggest</span>
+    @if (noSuggestions) {
      <span class="d-none d-lg-inline ps-1" i18n>No suggestions</span>
    } @else {
      <span class="d-none d-lg-inline ps-1" i18n>Suggest</span>
    }
    @if (totalSuggestions > 0) {
      <span class="badge bg-primary ms-2">{{ totalSuggestions }}</span>
    }
@@ -19,7 +25,7 @@
      <div ngbDropdownMenu aria-labelledby="suggestionsDropdown" class="shadow suggestions-dropdown">
        <div class="list-group list-group-flush small pb-0">
-          @if (!suggestions()?.suggested_tags && !suggestions()?.suggested_document_types && !suggestions()?.suggested_correspondents) {
+          @if (totalSuggestions === 0) {
            <div class="list-group-item text-muted fst-italic">
              <small class="text-muted small fst-italic" i18n>No novel suggestions</small>
            </div>
@@ -30,6 +30,34 @@ describe('SuggestionsDropdownComponent', () => {
    expect(component.totalSuggestions).toBe(4)
  })
  it('should show when a completed request returned no suggestions', () => {
    fixture.componentRef.setInput('suggestions', {
      correspondents: [],
      tags: [],
      document_types: [],
      storage_paths: [],
      dates: [],
    })
    fixture.detectChanges()
    expect(component.noSuggestions).toBeTruthy()
    expect(fixture.nativeElement.textContent).toContain('No suggestions')
  })
  it('should not show the empty state before a request or with suggestions', () => {
    expect(component.noSuggestions).toBeFalsy()
    fixture.componentRef.setInput('suggestions', {
      correspondents: [],
      tags: [42],
      document_types: [],
      storage_paths: [],
      dates: [],
    })
    expect(component.noSuggestions).toBeFalsy()
  })
  it('should emit getSuggestions when clickSuggest is called and suggestions are null', () => {
    jest.spyOn(component.getSuggestions, 'emit')
    fixture.componentRef.setInput('suggestions', null)
@@ -59,5 +87,6 @@ describe('SuggestionsDropdownComponent', () => {
    })
    component.clickSuggest()
    expect(component.dropdown.open).toBeTruthy()
    expect(fixture.nativeElement.textContent).toContain('No novel suggestions')
  })
 })
@@ -61,4 +61,21 @@ export class SuggestionsDropdownComponent {
        this.suggestions()?.suggested_document_types?.length || 0
    )
  }
  get noSuggestions(): boolean {
    const suggestions = this.suggestions()
    return (
      suggestions != null &&
      !suggestions.title &&
      !suggestions.tags?.length &&
      !suggestions.suggested_tags?.length &&
      !suggestions.correspondents?.length &&
      !suggestions.suggested_correspondents?.length &&
      !suggestions.document_types?.length &&
      !suggestions.suggested_document_types?.length &&
      !suggestions.storage_paths?.length &&
      !suggestions.suggested_storage_paths?.length &&
      !suggestions.dates?.length
    )
  }
 }
@@ -1,6 +1,7 @@
 <pngx-widget-frame
  *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }"
  [title]="savedView.name"
  [titleIcon]="savedView.icon || 'funnel'"
  [loading]="false"
  [draggable]="savedView"
  >
@@ -8,7 +8,12 @@
              <i-bs name="grip-vertical"></i-bs>
            </div>
          }
-          <h6 class="card-title mb-0">{{title()}}</h6>
+          <h6 class="card-title mb-0">
            @if (titleIcon()) {
              <i-bs class="me-2" [name]="titleIcon()"></i-bs>
            }
            {{title()}}
          </h6>
          <ng-content select="[title-badge]"></ng-content>
          @if (badge() !== null && badge() !== undefined) {
            <span class="badge bg-info text-dark ms-2">{{badge()}}</span>
@@ -16,6 +16,8 @@ export class WidgetFrameComponent implements AfterViewInit {
  title = input<string>()
  titleIcon = input<string>()
  draggable = input<any>()
  cardless = input(false)
@@ -113,8 +113,8 @@
    <form [formGroup]='documentForm' (ngSubmit)="save()">
-      <div class="btn-toolbar mb-1 border-bottom">
+      <div class="btn-toolbar justify-content-end mb-1 pb-3 gap-2 row-gap-2 border-bottom">
-        <div class="btn-group pb-3">
+        <div class="btn-group me-auto">
          <button type="button" class="btn btn-sm btn-outline-secondary" i18n-title title="Close" (click)="close()">
            <i-bs width="1.2em" height="1.2em" name="x"></i-bs>
          </button>
@@ -127,32 +127,36 @@
        </div>
        <ng-container *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }">
-          <div class="btn-group pb-3 ms-auto">
+          <div class="d-flex gap-2">
-            <pngx-suggestions-dropdown *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }"
+            <div class="btn-group">
-              [disabled]="!userCanEdit || suggestionsLoading()"
+              <pngx-suggestions-dropdown *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }"
-              [loading]="suggestionsLoading()"
+                [disabled]="!userCanEdit || suggestionsLoading()"
-              [suggestions]="suggestions()"
+                [loading]="suggestionsLoading()"
-              [aiEnabled]="aiEnabled"
+                [suggestions]="suggestions()"
-              (getSuggestions)="getSuggestions()"
+                [aiEnabled]="aiEnabled"
-              (addTag)="createTag($event)"
+                (getSuggestions)="getSuggestions()"
-              (addDocumentType)="createDocumentType($event)"
+                (addTag)="createTag($event)"
-              (addCorrespondent)="createCorrespondent($event)">
+                (addDocumentType)="createDocumentType($event)"
-            </pngx-suggestions-dropdown>
+                (addCorrespondent)="createCorrespondent($event)">
              </pngx-suggestions-dropdown>
            </div>
            <div class="btn-group">
              <pngx-custom-fields-dropdown
                *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.CustomField }"
                [documentId]="documentId()"
                [disabled]="!userCanEdit"
                [existingFields]="document()?.custom_fields"
                (created)="refreshCustomFields()"
                (added)="addField($event)">
              </pngx-custom-fields-dropdown>
            </div>
          </div>
-          <div class="btn-group pb-3 ms-2">
+          <div class="ps-3">
-            <pngx-custom-fields-dropdown
+            <ng-container *ngTemplateOutlet="saveButtons"></ng-container>
              *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.CustomField }"
              [documentId]="documentId()"
              [disabled]="!userCanEdit"
              [existingFields]="document()?.custom_fields"
              (created)="refreshCustomFields()"
              (added)="addField($event)">
            </pngx-custom-fields-dropdown>
          </div>
        </ng-container>
        <ng-container *ngTemplateOutlet="saveButtons"></ng-container>
      </div>
      <ul ngbNav #nav="ngbNav" class="nav-underline flex-nowrap flex-md-wrap overflow-auto" (navChange)="onNavChange($event)" [activeId]="activeNavID()" (activeIdChange)="activeNavID.set($event)">
@@ -276,7 +280,7 @@
              }
            </div>
-            <div class="d-flex border-top pt-3">
+            <div class="d-flex justify-content-end border-top pt-3">
              <ng-container *ngTemplateOutlet="saveButtons"></ng-container>
            </div>
          </ng-template>
@@ -440,7 +444,7 @@
 </div>
 <ng-template #saveButtons>
-  <div class="btn-group pb-3 ms-4">
+  <div class="btn-group">
    <ng-container *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }">
      <button type="submit" class="order-3 btn btn-sm btn-primary" i18n [disabled]="!userCanEdit || networkActive() || (isDirty$ | async) !== true">Save</button>
      @if (hasNext()) {
@@ -467,13 +467,6 @@ describe('DocumentDetailComponent', () => {
    const docWithVersions = {
      ...doc,
      versions: [
        {
          id: doc.id,
          added: new Date('2024-01-01T00:00:00Z'),
          version_label: 'Original',
          checksum: 'aaaa',
          is_root: true,
        },
        {
          id: 10,
          added: new Date('2024-01-02T00:00:00Z'),
@@ -481,6 +474,13 @@ describe('DocumentDetailComponent', () => {
          checksum: 'bbbb',
          is_root: false,
        },
        {
          id: doc.id,
          added: new Date('2024-01-01T00:00:00Z'),
          version_label: 'Original',
          checksum: 'aaaa',
          is_root: true,
        },
      ],
    } as Document
@@ -1232,8 +1232,8 @@ describe('DocumentDetailComponent', () => {
    metadataSpy.mockClear()
    component.document().versions = [
      { id: doc.id, is_root: true },
      { id: 10, is_root: false },
      { id: doc.id, is_root: true },
    ] as any
    jest.spyOn(documentService, 'getPreviewUrl').mockReturnValue('preview-root')
    jest.spyOn(documentService, 'getThumbUrl').mockReturnValue('thumb-root')
@@ -1564,7 +1564,7 @@ describe('DocumentDetailComponent', () => {
    dialog.confirmClicked.next()
    await openModal.result
-    expect(dialog.buttonsEnabled).toBe(false)
+    expect(dialog.buttonsEnabled()).toBe(false)
    expect(reloadSpy).toHaveBeenCalled()
    expect((component as any).incomingUpdateModal).toBeNull()
  })
@@ -1789,7 +1789,7 @@ describe('DocumentDetailComponent', () => {
    expect(errorSpy).toHaveBeenCalled()
    expect(component.networkActive()).toBe(false)
-    expect(dialog.buttonsEnabled).toBe(true)
+    expect(dialog.buttonsEnabled()).toBe(true)
  })
  it('should refresh the document when removing password in update mode', () => {
@@ -1929,8 +1929,8 @@ describe('DocumentDetailComponent', () => {
    component.documentId.set(doc.id)
    component.document.set({ ...doc, versions: [] } as Document)
    const updatedVersions = [
      { id: doc.id, is_root: true },
      { id: 10, is_root: false },
      { id: doc.id, is_root: true },
    ] as any
    const openDoc = { ...doc, versions: [] } as Document
    jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
@@ -2046,8 +2046,8 @@ describe('DocumentDetailComponent', () => {
  it('should include version in download and print only for non-latest selected version', () => {
    initNormally()
    component.document().versions = [
      { id: doc.id, is_root: true },
      { id: 10, is_root: false },
      { id: doc.id, is_root: true },
    ] as any
    const getDownloadUrlSpy = jest
@@ -2161,8 +2161,14 @@ describe('DocumentDetailComponent', () => {
  it('should support open share links and email modals', () => {
    const modalSpy = jest.spyOn(modalService, 'open')
    initNormally()
    component.selectedVersionId.set(10)
    component.openShareLinks()
    expect(modalSpy).toHaveBeenCalled()
    expect(
      (
        modalSpy.mock.results[0].value as NgbModalRef
      ).componentInstance.documentId()
    ).toBe(10)
    component.openEmailDocument()
    expect(modalSpy).toHaveBeenCalled()
  })
@@ -2191,9 +2197,6 @@ describe('DocumentDetailComponent', () => {
    const appendChildSpy = jest
      .spyOn(document.body, 'appendChild')
      .mockImplementation((node: Node) => node)
    const removeChildSpy = jest
      .spyOn(document.body, 'removeChild')
      .mockImplementation((node: Node) => node)
    const createObjectURLSpy = jest
      .spyOn(URL, 'createObjectURL')
      .mockReturnValue('blob:mock-url')
@@ -2212,6 +2215,7 @@ describe('DocumentDetailComponent', () => {
      src: '',
      onload: null,
      contentWindow: mockContentWindow,
      remove: jest.fn(),
    }
    const createElementSpy = jest
@@ -2255,12 +2259,11 @@ describe('DocumentDetailComponent', () => {
      mockContentWindow.onafterprint(new Event('afterprint'))
    }
-    expect(removeChildSpy).toHaveBeenCalledWith(mockIframe)
+    expect(mockIframe.remove).toHaveBeenCalled()
    expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:mock-url')
    createElementSpy.mockRestore()
    appendChildSpy.mockRestore()
    removeChildSpy.mockRestore()
    createObjectURLSpy.mockRestore()
    revokeObjectURLSpy.mockRestore()
  })
@@ -2307,9 +2310,6 @@ describe('DocumentDetailComponent', () => {
      const appendChildSpy = jest
        .spyOn(document.body, 'appendChild')
        .mockImplementation((node: Node) => node)
      const removeChildSpy = jest
        .spyOn(document.body, 'removeChild')
        .mockImplementation((node: Node) => node)
      const createObjectURLSpy = jest
        .spyOn(URL, 'createObjectURL')
        .mockReturnValue('blob:mock-url')
@@ -2332,6 +2332,7 @@ describe('DocumentDetailComponent', () => {
        src: '',
        onload: null,
        contentWindow: mockContentWindow,
        remove: jest.fn(),
      }
      const createElementSpy = jest
@@ -2354,15 +2355,21 @@ describe('DocumentDetailComponent', () => {
      if (expectToast) {
        expect(toastSpy).toHaveBeenCalled()
        expect(mockIframe.remove).toHaveBeenCalled()
        expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:mock-url')
      } else {
        expect(toastSpy).not.toHaveBeenCalled()
        expect(mockIframe.remove).not.toHaveBeenCalled()
        expect(revokeObjectURLSpy).not.toHaveBeenCalled()
        component.ngOnDestroy()
        expect(mockIframe.remove).toHaveBeenCalled()
        expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:mock-url')
      }
      expect(removeChildSpy).toHaveBeenCalledWith(mockIframe)
      expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:mock-url')
      createElementSpy.mockRestore()
      appendChildSpy.mockRestore()
      removeChildSpy.mockRestore()
      createObjectURLSpy.mockRestore()
      revokeObjectURLSpy.mockRestore()
    })
@@ -289,6 +289,8 @@ export class DocumentDetailComponent
  private incomingUpdateModal: NgbModalRef
  private pendingIncomingUpdate: IncomingDocumentUpdate
  private lastLocalSaveModified: string | null = null
  private printIframe: HTMLIFrameElement | null = null
  private printBlobUrl: string | null = null
  requiresPassword: boolean = false
  password: string
@@ -657,7 +659,7 @@ export class DocumentDetailComponent
    modal.componentInstance.cancelBtnCaption = $localize`Dismiss`
    modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-      modal.componentInstance.buttonsEnabled = false
+      modal.componentInstance.buttonsEnabled.set(false)
      modal.close()
      this.reloadRemoteVersion()
    })
@@ -868,6 +870,7 @@ export class DocumentDetailComponent
  }
  ngOnDestroy(): void {
    this.cleanupPrintDocument()
    this.unsubscribeNotifier.next(this)
    this.unsubscribeNotifier.complete()
  }
@@ -886,13 +889,9 @@ export class DocumentDetailComponent
  updateComponent(doc: Document) {
    this.document.set(doc)
-    // Default selected version is the newest version
+    // Default selected version is the newest version, which the API returns first
    const versions = doc.versions ?? []
-    this.selectedVersionId.set(
+    this.selectedVersionId.set(versions.length ? versions[0].id : doc.id)
      versions.length
        ? Math.max(...versions.map((version) => version.id))
        : doc.id
    )
    this.previewLoaded.set(false)
    this.requiresPassword = false
    this.updateFormForCustomFields()
@@ -1371,7 +1370,7 @@ export class DocumentDetailComponent
    modal.componentInstance.confirmClicked
      .pipe(
        switchMap(() => {
-          modal.componentInstance.buttonsEnabled = false
+          modal.componentInstance.buttonsEnabled.set(false)
          return this.documentsService.delete(this.document())
        })
      )
@@ -1383,7 +1382,7 @@ export class DocumentDetailComponent
        },
        error: (error) => {
          this.toastService.showError($localize`Error deleting document`, error)
-          modal.componentInstance.buttonsEnabled = true
+          modal.componentInstance.buttonsEnabled.set(true)
          this.subscribeModalDelete(modal)
        },
      })
@@ -1408,7 +1407,7 @@ export class DocumentDetailComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled = false
+      modal.componentInstance.buttonsEnabled.set(false)
      this.documentsService
        .reprocessDocuments({ documents: [this.document().id] })
        .subscribe({
@@ -1422,7 +1421,7 @@ export class DocumentDetailComponent
          },
          error: (error) => {
            if (modal) {
-              modal.componentInstance.buttonsEnabled = true
+              modal.componentInstance.buttonsEnabled.set(true)
            }
            this.toastService.showError(
              $localize`Error executing operation`,
@@ -1438,7 +1437,8 @@ export class DocumentDetailComponent
    if (!versions.length || !this.selectedVersionId()) {
      return null
    }
-    const latestVersionId = Math.max(...versions.map((version) => version.id))
+    // The API returns versions newest first
    const latestVersionId = versions[0].id
    return this.selectedVersionId() === latestVersionId
      ? null
      : this.selectedVersionId()
@@ -1795,7 +1795,7 @@ export class DocumentDetailComponent
    modal.componentInstance.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        modal.componentInstance.buttonsEnabled = false
+        modal.componentInstance.buttonsEnabled.set(false)
        this.documentsService
          .editPdfDocuments([sourceDocumentId], {
            operations: modal.componentInstance.getOperations(),
@@ -1818,7 +1818,7 @@ export class DocumentDetailComponent
            },
            error: (error) => {
              if (modal) {
-                modal.componentInstance.buttonsEnabled = true
+                modal.componentInstance.buttonsEnabled.set(true)
              }
              this.toastService.showError(
                $localize`Error executing PDF edit operation`,
@@ -1852,7 +1852,7 @@ export class DocumentDetailComponent
        const sourceDocumentId = this.selectedVersionId() ?? this.document().id
        const dialog =
          modal.componentInstance as PasswordRemovalConfirmDialogComponent
-        dialog.buttonsEnabled = false
+        dialog.buttonsEnabled.set(false)
        this.networkActive.set(true)
        this.documentsService
          .removePasswordDocuments([sourceDocumentId], {
@@ -1877,7 +1877,7 @@ export class DocumentDetailComponent
              }
            },
            error: (error) => {
-              dialog.buttonsEnabled = true
+              dialog.buttonsEnabled.set(true)
              this.networkActive.set(false)
              this.toastService.showError(
                $localize`Error executing password removal operation`,
@@ -1889,6 +1889,7 @@ export class DocumentDetailComponent
  }
  printDocument() {
    this.cleanupPrintDocument()
    const selectedVersionId = this.getSelectedNonLatestVersionId()
    const printUrl = this.documentsService.getDownloadUrl(
      this.document().id,
@@ -1902,6 +1903,8 @@ export class DocumentDetailComponent
        next: (blob) => {
          const blobUrl = URL.createObjectURL(blob)
          const iframe = document.createElement('iframe')
          this.printIframe = iframe
          this.printBlobUrl = blobUrl
          iframe.style.position = 'fixed'
          iframe.style.right = '0'
          iframe.style.bottom = '0'
@@ -1917,22 +1920,19 @@ export class DocumentDetailComponent
                iframe.contentWindow.focus()
                iframe.contentWindow.print()
                iframe.contentWindow.onafterprint = () => {
-                  document.body.removeChild(iframe)
+                  this.cleanupPrintDocument()
                  URL.revokeObjectURL(blobUrl)
                }
              } catch (err) {
                // FF throws cross-origin error on onafterprint
                const isCrossOriginAfterPrintError =
                  err instanceof DOMException &&
                  err.message.includes('onafterprint')
                // FF throws here while print preview is still reading the iframe
                // so keep it alive until the next print or teardown
                if (!isCrossOriginAfterPrintError) {
                  this.toastService.showError($localize`Print failed.`, err)
                  timer(100).subscribe(() => this.cleanupPrintDocument())
                }
                timer(100).subscribe(() => {
                  // delay to avoid FF print failure
                  document.body.removeChild(iframe)
                  URL.revokeObjectURL(blobUrl)
                })
              }
            })
          }
@@ -1945,9 +1945,20 @@ export class DocumentDetailComponent
      })
  }
  private cleanupPrintDocument() {
    if (this.printIframe) this.printIframe.remove()
    this.printIframe = null
    if (this.printBlobUrl) {
      URL.revokeObjectURL(this.printBlobUrl)
      this.printBlobUrl = null
    }
  }
  public openShareLinks() {
    const modal = this.modalService.open(ShareLinksDialogComponent)
-    modal.componentInstance.documentId.set(this.document().id)
+    modal.componentInstance.documentId.set(
      this.selectedVersionId() ?? this.document().id
    )
    modal.componentInstance.hasArchiveVersion.set(
      this.metadata()?.has_archive_version ??
        !!this.document()?.archived_file_name
@@ -0,0 +1,18 @@
 <div class="modal-header">
  <h4 class="modal-title" i18n>Add existing document as version</h4>
  <button type="button" class="btn-close" aria-label="Close" (click)="cancel()"></button>
 </div>
 <div class="modal-body">
  <pngx-input-document-link
    [(ngModel)]="selectedDocumentIDs"
    [parentDocumentID]="rootDocumentID"
    [minimal]="true"
    placeholder="Search for a document"
    i18n-placeholder
  ></pngx-input-document-link>
  <div class="form-text mt-2" i18n>Select one document to add as a version.</div>
 </div>
 <div class="modal-footer">
  <button type="button" class="btn btn-outline-secondary" (click)="cancel()" [disabled]="!buttonsEnabled()" i18n>Cancel</button>
  <button type="button" class="btn btn-primary" (click)="confirm()" [disabled]="!buttonsEnabled() || selectedDocumentIDs.length !== 1" i18n>Add version</button>
 </div>
@@ -0,0 +1,73 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { AddExistingDocumentVersionDialogComponent } from './add-existing-document-version-dialog.component'
 describe('AddExistingDocumentVersionDialogComponent', () => {
  let component: AddExistingDocumentVersionDialogComponent
  let fixture: ComponentFixture<AddExistingDocumentVersionDialogComponent>
  let activeModal: jest.Mocked<Pick<NgbActiveModal, 'dismiss'>>
  beforeEach(async () => {
    activeModal = { dismiss: jest.fn() }
    await TestBed.configureTestingModule({
      imports: [AddExistingDocumentVersionDialogComponent],
      providers: [
        {
          provide: NgbActiveModal,
          useValue: activeModal,
        },
        {
          provide: DocumentService,
          useValue: {},
        },
      ],
    }).compileComponents()
    fixture = TestBed.createComponent(AddExistingDocumentVersionDialogComponent)
    component = fixture.componentInstance
    component.rootDocumentID = 3
    fixture.detectChanges()
  })
  it('should emit the single selected document', () => {
    const emitSpy = jest.spyOn(component.confirmClicked, 'emit')
    component.selectedDocumentIDs = [20]
    component.confirm()
    expect(emitSpy).toHaveBeenCalledWith(20)
  })
  it('should require exactly one selected document', () => {
    const emitSpy = jest.spyOn(component.confirmClicked, 'emit')
    component.selectedDocumentIDs = [20, 21]
    component.confirm()
    expect(emitSpy).not.toHaveBeenCalled()
  })
  it('should dismiss on cancel', () => {
    component.cancel()
    expect(activeModal.dismiss).toHaveBeenCalled()
  })
  it('should re-render the buttons when they are toggled from outside', async () => {
    const cancelButton: HTMLButtonElement = fixture.nativeElement.querySelector(
      '.modal-footer button'
    )
    expect(cancelButton.disabled).toBeFalsy()
    // No detectChanges: the dropdown toggling this from a request callback is
    // all that happens, and nothing else schedules a render for the modal
    component.buttonsEnabled.set(false)
    await fixture.whenStable()
    expect(cancelButton.disabled).toBeTruthy()
    component.buttonsEnabled.set(true)
    await fixture.whenStable()
    expect(cancelButton.disabled).toBeFalsy()
  })
 })
@@ -0,0 +1,35 @@
 import {
  Component,
  EventEmitter,
  Input,
  Output,
  inject,
  signal,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { DocumentLinkComponent } from 'src/app/components/common/input/document-link/document-link.component'
@Component({
  selector: 'pngx-add-existing-document-version-dialog',
  templateUrl: './add-existing-document-version-dialog.component.html',
  imports: [DocumentLinkComponent, FormsModule],
 })
 export class AddExistingDocumentVersionDialogComponent {
  private readonly activeModal = inject(NgbActiveModal)
  @Input() rootDocumentID: number
  @Output() confirmClicked = new EventEmitter<number>()
  selectedDocumentIDs: number[] = []
  readonly buttonsEnabled = signal(true)
  confirm(): void {
    if (this.selectedDocumentIDs.length !== 1) return
    this.confirmClicked.emit(this.selectedDocumentIDs[0])
  }
  cancel(): void {
    this.activeModal.dismiss()
  }
 }
@@ -24,13 +24,26 @@
          class="visually-hidden"
          (change)="onVersionFileSelected($event)"
        />
-        <button
+        <div class="btn-group btn-group-sm w-100">
-          class="btn btn-sm btn-outline-secondary w-100"
+          <button
-          (click)="versionFileInput.click()"
+            class="btn btn-sm btn-outline-secondary w-100"
-          [disabled]="!userIsOwner || !userCanEdit"
+            (click)="versionFileInput.click()"
-        >
+            [disabled]="!userIsOwner || !userCanEdit"
-          <i-bs name="file-earmark-plus"></i-bs><span class="ps-1" i18n>Add new version</span>
+            title="Upload a new version"
-        </button>
+            i18n-title
          >
            <i-bs name="file-earmark-plus"></i-bs><span class="ps-1" i18n>Upload</span>
          </button>
          <button
            class="btn btn-sm btn-outline-secondary w-100"
            (click)="addExistingDocumentAsVersion()"
            [disabled]="!userIsOwner || !userCanEdit"
            title="Use an existing document"
            i18n-title
          >
            <i-bs name="file-earmark"></i-bs><span class="ps-1" i18n>Existing</span>
          </button>
        </div>
      } @else {
        @switch (versionUploadState()) {
          @case (UploadState.Uploading) {
@@ -128,6 +141,7 @@
              i18n-confirmMessage
              [disabled]="!userIsOwner || !userCanEdit"
              (confirm)="deleteVersion(version.id)"
              *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }"
            >
              <span class="visually-hidden" i18n>Delete version</span>
            </pngx-confirm-button>
@@ -1,9 +1,16 @@
 import { DatePipe } from '@angular/common'
-import { SimpleChange } from '@angular/core'
+import { SimpleChange, signal } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { By } from '@angular/platform-browser'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { Subject, of, throwError } from 'rxjs'
 import { DocumentVersionInfo } from 'src/app/data/document'
 import {
  PermissionAction,
  PermissionsService,
  PermissionType,
 } from 'src/app/services/permissions.service'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -19,12 +26,20 @@ describe('DocumentVersionDropdownComponent', () => {
  let documentService: jest.Mocked<
    Pick<
      DocumentService,
-      'deleteVersion' | 'getVersions' | 'uploadVersion' | 'updateVersionLabel'
+      | 'deleteVersion'
      | 'getVersions'
      | 'mergeDocumentsAsVersions'
      | 'uploadVersion'
      | 'updateVersionLabel'
    >
  >
  let toastService: jest.Mocked<Pick<ToastService, 'showError' | 'showInfo'>>
  let finished$: Subject<{ taskId: string }>
  let failed$: Subject<{ taskId: string; message?: string }>
  let modalService: jest.Mocked<Pick<NgbModal, 'open'>>
  let permissionsService: jest.Mocked<
    Pick<PermissionsService, 'currentUserCan'>
  >
  beforeEach(async () => {
    finished$ = new Subject<{ taskId: string }>()
@@ -32,13 +47,18 @@ describe('DocumentVersionDropdownComponent', () => {
    documentService = {
      deleteVersion: jest.fn(),
      getVersions: jest.fn(),
      mergeDocumentsAsVersions: jest.fn(),
      uploadVersion: jest.fn(),
      updateVersionLabel: jest.fn(),
    }
    modalService = { open: jest.fn() }
    toastService = {
      showError: jest.fn(),
      showInfo: jest.fn(),
    }
    permissionsService = {
      currentUserCan: jest.fn().mockReturnValue(true),
    }
    await TestBed.configureTestingModule({
      imports: [
@@ -61,6 +81,14 @@ describe('DocumentVersionDropdownComponent', () => {
          provide: ToastService,
          useValue: toastService,
        },
        {
          provide: NgbModal,
          useValue: modalService,
        },
        {
          provide: PermissionsService,
          useValue: permissionsService,
        },
        {
          provide: WebsocketStatusService,
          useValue: {
@@ -131,6 +159,31 @@ describe('DocumentVersionDropdownComponent', () => {
    )
  })
  it('should not show version delete buttons without document delete permission', () => {
    fixture.destroy()
    permissionsService.currentUserCan.mockReturnValue(false)
    fixture = TestBed.createComponent(DocumentVersionDropdownComponent)
    component = fixture.componentInstance
    component.documentId = 3
    component.selectedVersionId = 3
    component.userIsOwner = true
    component.userCanEdit = true
    component.versions = [
      { id: 3, is_root: true, checksum: 'aaaa' },
      { id: 10, is_root: false, checksum: 'bbbb' },
    ]
    fixture.detectChanges()
    expect(permissionsService.currentUserCan).toHaveBeenCalledWith(
      PermissionAction.Delete,
      PermissionType.Document
    )
    expect(
      fixture.debugElement.queryAll(By.css('pngx-confirm-button'))
    ).toHaveLength(0)
  })
  it('beginEditingVersion should set active row and draft label', () => {
    component.userCanEdit = true
    component.userIsOwner = true
@@ -222,9 +275,10 @@ describe('DocumentVersionDropdownComponent', () => {
  })
  it('onVersionFileSelected should upload and update versions after websocket success', () => {
    // Newest first, as the API returns them
    const versions: DocumentVersionInfo[] = [
      { id: 3, is_root: true, checksum: 'aaaa' },
      { id: 20, is_root: false, checksum: 'cccc' },
      { id: 3, is_root: true, checksum: 'aaaa' },
    ]
    const file = new File(['test'], 'new-version.pdf', {
      type: 'application/pdf',
@@ -323,4 +377,45 @@ describe('DocumentVersionDropdownComponent', () => {
    expect(component.editingVersionId).toBeNull()
    expect(component.versionLabelDraft).toEqual('')
  })
  it('addExistingDocumentAsVersion should merge with a label and refresh versions', () => {
    const confirmClicked = new Subject<number>()
    const modal = {
      componentInstance: {
        rootDocumentID: null,
        buttonsEnabled: signal(true),
        confirmClicked,
      },
      close: jest.fn(),
    }
    modalService.open.mockReturnValue(modal as any)
    documentService.mergeDocumentsAsVersions.mockReturnValue(of({} as any))
    // Newest first, as the API returns them. The merged document has a lower id
    // than the root, which is the whole point of merging an existing document.
    const versions: DocumentVersionInfo[] = [
      { id: 2, is_root: false, checksum: 'cccc' },
      { id: 3, is_root: true, checksum: 'aaaa' },
    ]
    documentService.getVersions.mockReturnValue(of({ id: 3, versions } as any))
    component.newVersionLabel = '  Imported  '
    const versionsEmitSpy = jest.spyOn(component.versionsUpdated, 'emit')
    const selectedEmitSpy = jest.spyOn(component.versionSelected, 'emit')
    component.addExistingDocumentAsVersion()
    expect(modal.componentInstance.rootDocumentID).toEqual(3)
    confirmClicked.next(2)
    expect(documentService.mergeDocumentsAsVersions).toHaveBeenCalledWith(
      [3, 2],
      3,
      'Imported'
    )
    expect(documentService.updateVersionLabel).not.toHaveBeenCalled()
    expect(documentService.getVersions).toHaveBeenCalledWith(3)
    expect(versionsEmitSpy).toHaveBeenCalledWith(versions)
    expect(selectedEmitSpy).toHaveBeenCalledWith(2)
    expect(component.newVersionLabel).toEqual('')
    expect(modal.close).toHaveBeenCalled()
    expect(toastService.showInfo).toHaveBeenCalled()
  })
 })
@@ -11,7 +11,7 @@ import {
  SimpleChanges,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
-import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { merge, of, Subject } from 'rxjs'
 import {
@@ -25,6 +25,7 @@ import {
  tap,
 } from 'rxjs/operators'
 import { DocumentVersionInfo } from 'src/app/data/document'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -33,6 +34,8 @@ import {
  WebsocketStatusService,
 } from 'src/app/services/websocket-status.service'
 import { ConfirmButtonComponent } from '../../common/confirm-button/confirm-button.component'
 import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component'
 import { AddExistingDocumentVersionDialogComponent } from './add-existing-document-version-dialog/add-existing-document-version-dialog.component'
@Component({
  selector: 'pngx-document-version-dropdown',
@@ -43,11 +46,15 @@ import { ConfirmButtonComponent } from '../../common/confirm-button/confirm-butt
    NgbDropdownModule,
    NgxBootstrapIconsModule,
    ConfirmButtonComponent,
    IfPermissionsDirective,
    SlicePipe,
    CustomDatePipe,
  ],
 })
-export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
+export class DocumentVersionDropdownComponent
  extends ComponentWithPermissions
  implements OnChanges, OnDestroy
 {
  UploadState = UploadState
  @Input() documentId: number
@@ -69,6 +76,7 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
  private readonly documentsService = inject(DocumentService)
  private readonly toastService = inject(ToastService)
  private readonly websocketStatusService = inject(WebsocketStatusService)
  private readonly modalService = inject(NgbModal)
  private readonly destroy$ = new Subject<void>()
  private readonly documentChange$ = new Subject<void>()
@@ -256,11 +264,10 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
      .subscribe({
        next: (doc) => {
          if (uploadDocumentId !== this.documentId) return
-          if (doc?.versions) {
+          if (doc?.versions?.length) {
            this.versionsUpdated.emit(doc.versions)
-            this.versionSelected.emit(
+            // The API returns versions newest first
-              Math.max(...doc.versions.map((version) => version.id))
+            this.versionSelected.emit(doc.versions[0].id)
            )
            this.clearVersionUploadStatus()
          }
        },
@@ -278,6 +285,55 @@ export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
      })
  }
  addExistingDocumentAsVersion(): void {
    const modal = this.modalService.open(
      AddExistingDocumentVersionDialogComponent,
      { backdrop: 'static' }
    )
    const dialog =
      modal.componentInstance as AddExistingDocumentVersionDialogComponent
    dialog.rootDocumentID = this.documentId
    dialog.confirmClicked
      .pipe(takeUntil(this.destroy$), takeUntil(this.documentChange$))
      .subscribe((existingDocumentID) => {
        dialog.buttonsEnabled.set(false)
        const versionLabel = this.newVersionLabel?.trim()
        this.documentsService
          .mergeDocumentsAsVersions(
            [this.documentId, existingDocumentID],
            this.documentId,
            versionLabel
          )
          .pipe(
            switchMap(() => this.documentsService.getVersions(this.documentId)),
            first(),
            finalize(() => dialog.buttonsEnabled.set(true)),
            takeUntil(this.destroy$),
            takeUntil(this.documentChange$)
          )
          .subscribe({
            next: (document) => {
              if (document?.versions?.length) {
                this.versionsUpdated.emit(document.versions)
                // The API returns versions newest first
                this.versionSelected.emit(document.versions[0].id)
              }
              this.newVersionLabel = ''
              modal.close()
              this.toastService.showInfo(
                $localize`Existing document added as a version.`
              )
            },
            error: (error) => {
              this.toastService.showError(
                $localize`Error adding existing document as a version`,
                error
              )
            },
          })
      })
  }
  clearVersionUploadStatus(): void {
    this.versionUploadState.set(UploadState.Idle)
    this.versionUploadError.set(null)
@@ -95,6 +95,9 @@
          <button ngbDropdownItem (click)="mergeSelected()" [disabled]="!userCanAdd || list.allSelected || list.selectedCount < 2">
            <i-bs name="journals" class="me-1"></i-bs><ng-container i18n>Merge</ng-container>
          </button>
          <button ngbDropdownItem (click)="mergeSelectedAsVersions()" [disabled]="!userOwnsAll || !userCanEditAll || !userCanDelete || list.allSelected || list.selectedCount < 2">
            <i-bs name="journal-bookmark-fill" class="me-1"></i-bs><ng-container i18n>Merge as versions</ng-container>
          </button>
        </div>
      </div>
    </div>
@@ -1248,6 +1248,89 @@ describe('BulkEditorComponent', () => {
    expect(documentListViewService.selected.size).toEqual(0)
  })
  it('should support merging documents as versions', () => {
    let modal: NgbModalRef
    modalService.activeInstances.subscribe((m) => (modal = m[0]))
    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
    jest
      .spyOn(documentListViewService, 'documents', 'get')
      .mockReturnValue([{ id: 3 }, { id: 4 }])
    jest.spyOn(documentService, 'getFew').mockReturnValue(
      of({
        all: [3, 4],
        count: 2,
        results: [
          { id: 3, title: 'Document 3' },
          { id: 4, title: 'Document 4' },
        ],
      })
    )
    jest
      .spyOn(documentListViewService, 'selected', 'get')
      .mockReturnValue(new Set([3, 4]))
    jest
      .spyOn(permissionsService, 'currentUserHasObjectPermissions')
      .mockReturnValue(true)
    jest
      .spyOn(permissionsService, 'currentUserOwnsObject')
      .mockReturnValue(true)
    const mergeAsVersionsSpy = jest
      .spyOn(documentService, 'mergeDocumentsAsVersions')
      .mockReturnValue(of(true))
    const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
    fixture.detectChanges()
    component.mergeSelectedAsVersions()
    expect(modal).not.toBeUndefined()
    modal.componentInstance.rootDocumentID.set(4)
    modal.componentInstance.confirm()
    expect(mergeAsVersionsSpy).toHaveBeenCalledWith([3, 4], 4)
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
    )
    httpTestingController.match(
      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
    )
    expect(documentListViewService.selected.size).toEqual(0)
    expect(toastInfoSpy).toHaveBeenCalledWith('Documents merged as versions.')
  })
  it('should not report success when merging documents as versions fails', () => {
    let modal: NgbModalRef
    modalService.activeInstances.subscribe((m) => (modal = m[0]))
    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
    jest
      .spyOn(documentListViewService, 'documents', 'get')
      .mockReturnValue([{ id: 3 }, { id: 4 }])
    jest.spyOn(documentService, 'getFew').mockReturnValue(
      of({
        all: [3, 4],
        count: 2,
        results: [
          { id: 3, title: 'Document 3' },
          { id: 4, title: 'Document 4' },
        ],
      })
    )
    jest
      .spyOn(documentListViewService, 'selected', 'get')
      .mockReturnValue(new Set([3, 4]))
    jest
      .spyOn(documentService, 'mergeDocumentsAsVersions')
      .mockReturnValue(throwError(() => new Error('failed')))
    const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
    const toastErrorSpy = jest.spyOn(toastService, 'showError')
    fixture.detectChanges()
    component.mergeSelectedAsVersions()
    modal.componentInstance.rootDocumentID.set(4)
    modal.componentInstance.confirm()
    expect(toastErrorSpy).toHaveBeenCalled()
    expect(toastInfoSpy).not.toHaveBeenCalled()
  })
  it('should support bulk download with archive, originals or both and file formatting', () => {
    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
    jest
@@ -1683,7 +1766,7 @@ describe('BulkEditorComponent', () => {
          expiration_days: 7,
        },
        loading: signal(false),
-        buttonsEnabled: true,
+        buttonsEnabled: signal(true),
        copied: signal(false),
      },
    }
@@ -1715,7 +1798,7 @@ describe('BulkEditorComponent', () => {
      expiration_days: 7,
    })
    expect(dialogInstance.loading()).toBe(false)
-    expect(dialogInstance.buttonsEnabled).toBe(false)
+    expect(dialogInstance.buttonsEnabled()).toBe(false)
    expect(dialogInstance.createdBundle).toEqual({ id: 42 })
    expect(typeof dialogInstance.onOpenManage).toBe('function')
    expect(toastInfoSpy).toHaveBeenCalledWith(
@@ -1755,7 +1838,7 @@ describe('BulkEditorComponent', () => {
          expiration_days: null,
        },
        loading: signal(false),
-        buttonsEnabled: true,
+        buttonsEnabled: signal(true),
      },
    }
@@ -1777,7 +1860,7 @@ describe('BulkEditorComponent', () => {
      expect.any(Error)
    )
    expect(dialogInstance.loading()).toBe(false)
-    expect(dialogInstance.buttonsEnabled).toBe(true)
+    expect(dialogInstance.buttonsEnabled()).toBe(true)
    openSpy.mockRestore()
  })
@@ -50,6 +50,7 @@ import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { flattenTags } from 'src/app/utils/flatten-tags'
 import { queryParamsFromFilterRules } from 'src/app/utils/query-params'
 import { MergeAsVersionsConfirmDialogComponent } from '../../common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component'
 import { MergeConfirmDialogComponent } from '../../common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component'
 import { RotateConfirmDialogComponent } from '../../common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component'
 import { CorrespondentEditDialogComponent } from '../../common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component'
@@ -171,6 +172,13 @@ export class BulkEditorComponent
    )
  }
  get userCanDelete(): boolean {
    return this.permissionService.currentUserCan(
      PermissionAction.Delete,
      PermissionType.Document
    )
  }
  ngOnInit() {
    if (
      this.permissionService.currentUserCan(
@@ -273,7 +281,7 @@ export class BulkEditorComponent
    overrideSelection?: DocumentSelectionQuery
  ) {
    if (modal) {
-      this.setModalButtonsEnabled(modal, false)
+      modal.componentInstance.buttonsEnabled.set(false)
    }
    this.documentService
      .bulkEdit(overrideSelection ?? this.getSelectionQuery(), method, args)
@@ -287,14 +295,17 @@ export class BulkEditorComponent
  private executeDocumentAction(
    modal: NgbModalRef,
    request: Observable<any>,
-    options: { deleteOriginals?: boolean } = {}
+    options: { clearSelection?: boolean; successMessage?: string } = {}
  ) {
    if (modal) {
-      this.setModalButtonsEnabled(modal, false)
+      modal.componentInstance.buttonsEnabled.set(false)
    }
    request.pipe(first()).subscribe({
      next: () => {
-        this.handleOperationSuccess(modal, options.deleteOriginals ?? false)
+        this.handleOperationSuccess(modal, options.clearSelection ?? false)
        if (options.successMessage) {
          this.toastService.showInfo(options.successMessage)
        }
      },
      error: (error) => this.handleOperationError(modal, error),
    })
@@ -320,7 +331,7 @@ export class BulkEditorComponent
  private handleOperationError(modal: NgbModalRef, error: any) {
    if (modal) {
-      this.setModalButtonsEnabled(modal, true)
+      modal.componentInstance.buttonsEnabled.set(true)
    }
    this.toastService.showError(
      $localize`Error executing bulk operation`,
@@ -328,15 +339,6 @@ export class BulkEditorComponent
    )
  }
  private setModalButtonsEnabled(modal: NgbModalRef, enabled: boolean) {
    const buttonsEnabled = modal.componentInstance.buttonsEnabled
    if (typeof buttonsEnabled?.set === 'function') {
      buttonsEnabled.set(enabled)
    } else {
      modal.componentInstance.buttonsEnabled = enabled
    }
  }
  private applySelectionData(
    items: SelectionDataItem[],
    selectionModel: FilterableDropdownSelectionModel
@@ -771,6 +773,7 @@ export class BulkEditorComponent
        this.tagSelectionModel.items = flattenTags(tags.results)
        this.tagSelectionModel.toggle(newTag.id)
      })
    return modal
  }
  createCorrespondent(name: string) {
@@ -794,6 +797,7 @@ export class BulkEditorComponent
        this.correspondentSelectionModel.items = correspondents.results
        this.correspondentSelectionModel.toggle(newCorrespondent.id)
      })
    return modal
  }
  createDocumentType(name: string) {
@@ -815,6 +819,7 @@ export class BulkEditorComponent
        this.documentTypeSelectionModel.items = documentTypes.results
        this.documentTypeSelectionModel.toggle(newDocumentType.id)
      })
    return modal
  }
  createStoragePath(name: string) {
@@ -836,6 +841,7 @@ export class BulkEditorComponent
        this.storagePathsSelectionModel.items = storagePaths.results
        this.storagePathsSelectionModel.toggle(newStoragePath.id)
      })
    return modal
  }
  createCustomField(name: string) {
@@ -857,6 +863,7 @@ export class BulkEditorComponent
        this.customFieldsSelectionModel.items = customFields.results
        this.customFieldsSelectionModel.toggle(newCustomField.id)
      })
    return modal
  }
  applyDelete() {
@@ -872,7 +879,7 @@ export class BulkEditorComponent
      modal.componentInstance.confirmClicked
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe(() => {
-          modal.componentInstance.buttonsEnabled = false
+          modal.componentInstance.buttonsEnabled.set(false)
          this.executeDocumentAction(
            modal,
            this.documentService.deleteDocuments(this.getSelectionQuery())
@@ -920,7 +927,7 @@ export class BulkEditorComponent
    modal.componentInstance.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        modal.componentInstance.buttonsEnabled = false
+        modal.componentInstance.buttonsEnabled.set(false)
        this.executeDocumentAction(
          modal,
          this.documentService.reprocessDocuments(this.getSelectionQuery())
@@ -957,7 +964,7 @@ export class BulkEditorComponent
    rotateDialog.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        rotateDialog.buttonsEnabled = false
+        rotateDialog.buttonsEnabled.set(false)
        this.executeDocumentAction(
          modal,
          this.documentService.rotateDocuments(
@@ -990,11 +997,11 @@ export class BulkEditorComponent
        if (mergeDialog.archiveFallback()) {
          args.archive_fallback = true
        }
-        mergeDialog.buttonsEnabled = false
+        mergeDialog.buttonsEnabled.set(false)
        this.executeDocumentAction(
          modal,
          this.documentService.mergeDocuments(mergeDialog.documentIDs(), args),
-          { deleteOriginals: !!args.delete_originals }
+          { clearSelection: !!args.delete_originals }
        )
        this.toastService.showInfo(
          $localize`Merged document will be queued for consumption.`
@@ -1002,6 +1009,35 @@ export class BulkEditorComponent
      })
  }
  mergeSelectedAsVersions() {
    let modal = this.modalService.open(MergeAsVersionsConfirmDialogComponent, {
      backdrop: 'static',
    })
    const mergeDialog =
      modal.componentInstance as MergeAsVersionsConfirmDialogComponent
    const documentIDs = Array.from(this.list.selected)
    mergeDialog.title = $localize`Merge as versions`
    mergeDialog.message = $localize`The selected documents will become versions of the root document.`
    mergeDialog.btnCaption = $localize`Proceed`
    mergeDialog.documentIDs.set(documentIDs)
    mergeDialog.rootDocumentID.set(documentIDs[0])
    mergeDialog.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
        this.executeDocumentAction(
          modal,
          this.documentService.mergeDocumentsAsVersions(
            mergeDialog.documentIDs(),
            mergeDialog.rootDocumentID()
          ),
          {
            clearSelection: true,
            successMessage: $localize`Documents merged as versions.`,
          }
        )
      })
  }
  public setCustomFieldValues(changedCustomFields: ChangedItems) {
    const modal = this.modalService.open(CustomFieldsBulkEditDialogComponent, {
      backdrop: 'static',
@@ -1063,14 +1099,14 @@ export class BulkEditorComponent
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
        dialog.loading.set(true)
-        dialog.buttonsEnabled = false
+        dialog.buttonsEnabled.set(false)
        this.shareLinkBundleService
          .createBundle(dialog.payload)
          .pipe(first())
          .subscribe({
            next: (result) => {
              dialog.loading.set(false)
-              dialog.buttonsEnabled = false
+              dialog.buttonsEnabled.set(false)
              dialog.createdBundle = result
              dialog.copied.set(false)
              dialog.payload = null
@@ -1084,7 +1120,7 @@ export class BulkEditorComponent
            },
            error: (error) => {
              dialog.loading.set(false)
-              dialog.buttonsEnabled = true
+              dialog.buttonsEnabled.set(true)
              this.toastService.showError(
                $localize`Share link bundle creation is not available yet.`,
                error
@@ -97,7 +97,9 @@
    <div class="dropdown-menu shadow dropdown-menu-right" ngbDropdownMenu>
      @if (!list.activeSavedViewId) {
        @for (view of savedViewService.allViews; track view) {
-          <button ngbDropdownItem (click)="loadViewConfig(view.id)">{{view.name}}</button>
+          <button ngbDropdownItem (click)="loadViewConfig(view.id)">
            <i-bs class="me-2" [name]="view.icon || 'funnel'"></i-bs>{{view.name}}
          </button>
        }
        @if (savedViewService.allViews.length > 0) {
          <div class="dropdown-divider"></div>
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1 @@`
							`/etc/s6-overlay/s6-rc.d/init-llmindex-migrate/run`