Merge branch 'dev' into feature/ocr-templates

[skip ci]

.github/release-drafter.yml

@@ -1,51 +1,49 @@
 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'
-    when:
-      - label: 'breaking-change'
+    labels:
+      - 'breaking-change'
   - title: 'Notable Changes'
-    when:
-      - label: 'notable'
+    labels:
+      - 'notable'
   - title: 'Features / Enhancements'
-    when:
-      - label: 'enhancement'
+    labels:
+      - 'enhancement'
   - title: 'Bug Fixes'
-    when:
-      - label: 'bug'
+    labels:
+      - 'bug'
   - title: 'Documentation'
-    when:
-      - label: 'documentation'
+    labels:
+      - 'documentation'
   - title: 'Maintenance'
-    when:
-      - label: 'chore'
-      - label: 'deployment'
-      - label: 'translation'
-      - label: 'ci-cd'
+    labels:
+      - 'chore'
+      - 'deployment'
+      - 'translation'
+      - 'ci-cd'
   - title: 'Dependencies'
     collapse-after: 3
-    when:
-      - label: 'dependencies'
+    labels:
+      - 'dependencies'
   - title: 'All App Changes'
+    labels:
+      - 'frontend'
+      - 'backend'
     collapse-after: 1
-    when:
-      - label: 'frontend'
-      - label: 'backend'
+include-labels:
+  - 'enhancement'
+  - 'bug'
+  - '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))'

.github/workflows/ci-backend.yml

@@ -11,7 +11,7 @@ concurrency:
   group: backend-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEFAULT_UV_VERSION: "0.12.x"
+  DEFAULT_UV_VERSION: "0.11.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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         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@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         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@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "${{ matrix.python-version }}"
       - name: Install uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "${{ env.DEFAULT_PYTHON }}"
       - name: Install uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true

.github/workflows/ci-docker.yml

@@ -41,7 +41,7 @@ jobs:
       ref-name: ${{ steps.ref.outputs.name }}
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         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@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         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@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.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@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.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@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         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@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         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@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
       - name: Docker metadata
         id: docker-meta
-        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
         with:
           images: |
             ${{ env.REGISTRY }}/${{ needs.build-arch.outputs.repository }}

.github/workflows/ci-docs.yml

@@ -11,7 +11,7 @@ concurrency:
 permissions:
   contents: read
 env:
-  DEFAULT_UV_VERSION: "0.12.x"
+  DEFAULT_UV_VERSION: "0.11.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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         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@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true

.github/workflows/ci-frontend.yml

@@ -21,7 +21,7 @@ jobs:
       frontend_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.frontend == 'true' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         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@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         with:
           base: ${{ steps.range.outputs.base }}
           ref: ${{ steps.range.outputs.ref }}
@@ -77,15 +77,15 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Install pnpm
         uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
-          package_json_file: src-ui/package.json
+          version: 10
       - name: Use Node.js 24
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 24.x
           cache: 'pnpm'
@@ -109,15 +109,15 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Install pnpm
         uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
-          package_json_file: src-ui/package.json
+          version: 10
       - name: Use Node.js 24
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.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: Install dependencies
-        run: cd src-ui && pnpm install --frozen-lockfile
+      - name: Re-link Angular CLI
+        run: cd src-ui && pnpm link @angular/cli
       - 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Install pnpm
         uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
-          package_json_file: src-ui/package.json
+          version: 10
       - name: Use Node.js 24
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.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: Install dependencies
-        run: cd src-ui && pnpm install --frozen-lockfile
+      - name: Re-link Angular CLI
+        run: cd src-ui && pnpm link @angular/cli
       - 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.62.0-noble
+    container: mcr.microsoft.com/playwright:v1.61.1-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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Install pnpm
         uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
-          package_json_file: src-ui/package.json
+          version: 10
       - name: Use Node.js 24
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 24.x
           cache: 'pnpm'
@@ -223,29 +223,32 @@ 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 --frozen-lockfile
+        run: cd src-ui && pnpm install --no-frozen-lockfile
       - name: Run Playwright E2E tests
         run: cd src-ui && pnpm exec playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
-  frontend-build:
-    name: Frontend Build
+  bundle-analysis:
+    name: Bundle Analysis
     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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 2
           persist-credentials: false
       - name: Install pnpm
         uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
-          package_json_file: src-ui/package.json
+          version: 10
       - name: Use Node.js 24
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 24.x
           cache: 'pnpm'
@@ -257,19 +260,21 @@ jobs:
             ~/.pnpm-store
             ~/.cache
           key: ${{ runner.os }}-frontend-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
-      - name: Install dependencies
-        run: cd src-ui && pnpm install --frozen-lockfile
-      - name: Build
+      - name: Re-link Angular CLI
+        run: cd src-ui && pnpm link @angular/cli
+      - name: Build and analyze
+        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, frontend-build]
+    needs: [changes, install-dependencies, lint, unit-tests, e2e-tests, bundle-analysis]
     if: always()
     runs-on: ubuntu-slim
     steps:
       - name: Check gate
         env:
-          BUILD_RESULT: ${{ needs['frontend-build'].result }}
+          BUNDLE_ANALYSIS_RESULT: ${{ needs['bundle-analysis'].result }}
           E2E_RESULT: ${{ needs['e2e-tests'].result }}
           FRONTEND_CHANGED: ${{ needs.changes.outputs.frontend_changed }}
           INSTALL_RESULT: ${{ needs['install-dependencies'].result }}
@@ -301,8 +306,8 @@ jobs:
             exit 1
           fi
 
-          if [[ "${BUILD_RESULT}" != "success" ]]; then
-            echo "::error::Frontend build job result: ${BUILD_RESULT}"
+          if [[ "${BUNDLE_ANALYSIS_RESULT}" != "success" ]]; then
+            echo "::error::Frontend bundle-analysis job result: ${BUNDLE_ANALYSIS_RESULT}"
             exit 1
           fi
 

.github/workflows/ci-lint.yml

@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-slim
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Install Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.14"
       - name: Run prek
-        uses: j178/prek-action@5337cb91e0fa35a7ff31b9ca345126d8bbbcdf16 # v2.0.6
+        uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4

.github/workflows/ci-release.yml

@@ -8,7 +8,7 @@ concurrency:
   group: release-${{ github.ref }}
   cancel-in-progress: false
 env:
-  DEFAULT_UV_VERSION: "0.12.x"
+  DEFAULT_UV_VERSION: "0.11.x"
   DEFAULT_PYTHON_VERSION: "3.12"
 permissions: {}
 jobs:
@@ -20,13 +20,12 @@ jobs:
       statuses: read
     steps:
       - name: Wait for Docker build
-        uses: lewagon/wait-on-check-action@2271c86c146b96545b4e871b855e10ffa6f50773 # v1.9.0
+        uses: lewagon/wait-on-check-action@96d9100b431964d10e0136aff8b9ccb92470505e # v1.8.0
         with:
           ref: ${{ github.sha }}
           check-name: 'Merge and Push Manifest'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 60
-          checks-discovery-timeout: 1800
   build-release:
     name: Build Release
     needs: wait-for-docker
@@ -35,16 +34,16 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       # ---- Frontend Build ----
       - name: Install pnpm
         uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
-          package_json_file: src-ui/package.json
+          version: 10
       - name: Use Node.js 24
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 24.x
           package-manager-cache: false
@@ -55,11 +54,11 @@ jobs:
       # ---- Backend Setup ----
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: false
@@ -86,7 +85,7 @@ jobs:
       # ---- Prepare Release ----
       - name: Generate requirements file
         run: |
-          uv export --quiet --no-dev --all-extras --emit-index-url --format requirements-txt --output-file requirements.txt
+          uv export --quiet --no-dev --all-extras --format requirements-txt --output-file requirements.txt
       - name: Compile messages
         env:
           PAPERLESS_SECRET_KEY: "ci-release-not-a-real-secret"
@@ -171,7 +170,7 @@ jobs:
           fi
       - name: Create release and changelog
         id: create-release
-        uses: release-drafter/release-drafter@eada3c96a64734dd381cfbda23511034e328ddb0 # v7.6.0
+        uses: release-drafter/release-drafter@4d75298e00d9e34c483e5ff8c68d0ea1c1940c1e # v7.5.1
         with:
           name: Paperless-ngx ${{ steps.get-version.outputs.version }}
           tag: ${{ steps.get-version.outputs.version }}
@@ -202,17 +201,17 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: main
           persist-credentials: true # for pushing changelog branch
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: false

.github/workflows/ci-static-analysis.yml

@@ -22,11 +22,11 @@ jobs:
       security-events: write
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Run zizmor
-        uses: zizmorcore/zizmor-action@6fc4b006235f201fdab3722e17240ab420d580e5 # v0.6.1
+        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7
   semgrep:
     name: Semgrep CE
     runs-on: ubuntu-24.04
@@ -38,13 +38,13 @@ jobs:
       security-events: write
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         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@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
+        uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
         if: always()
         with:
           sarif_file: results.sarif

.github/workflows/codeql-analysis.yml

@@ -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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
+        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
         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@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
+        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

.github/workflows/crowdin.yml

@@ -17,12 +17,12 @@ jobs:
     environment: translation-sync
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           token: ${{ secrets.PNGX_BOT_PAT }}
           persist-credentials: false
       - name: crowdin action
-        uses: crowdin/github-action@c7af9bc98b01694653031fef2a0dc6c7888ce9bc # v2.17.0
+        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2.16.3
         with:
           upload_translations: false
           download_translations: true

.github/workflows/pr-bot.yml

@@ -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@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13 # v7.0.0
+        uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Label by size

.github/workflows/project-actions.yml

@@ -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@eada3c96a64734dd381cfbda23511034e328ddb0 # v7.6.0
+        uses: release-drafter/release-drafter@4d75298e00d9e34c483e5ff8c68d0ea1c1940c1e # v7.5.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/repo-maintenance.yml

@@ -14,7 +14,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
+      - uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
         with:
           days-before-stale: 7
           days-before-close: 14

.github/workflows/translate-strings.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - dev
 env:
-  DEFAULT_UV_VERSION: "0.12.x"
+  DEFAULT_UV_VERSION: "0.11.x"
 jobs:
   generate-translate-strings:
     name: Generate Translation Strings
@@ -14,7 +14,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         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@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.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@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.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:
-          package_json_file: src-ui/package.json
+          version: 10
       - name: Use Node.js 24
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 24.x
           cache: 'pnpm'
@@ -61,13 +61,16 @@ jobs:
             ~/.cache
           key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
       - name: Install frontend dependencies
-        run: cd src-ui && pnpm install --frozen-lockfile
+        if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
+        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@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
+        uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
         with:
           file_pattern: 'src-ui/messages.xlf src/locale/en_US/LC_MESSAGES/django.po'
           commit_message: "Auto translate strings"

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
       - id: check-case-conflict
       - id: detect-private-key
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.3
+    rev: v2.4.2
     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.6'
+    rev: 'v3.8.4'
     hooks:
       - id: prettier
         types_or:
@@ -46,16 +46,16 @@ repos:
           - ts
           - markdown
         additional_dependencies:
-          - prettier@3.9.6
+          - prettier@3.8.3
           - 'prettier-plugin-organize-imports@4.3.0'
   # Python hooks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.1
+    rev: v0.15.17
     hooks:
       - id: ruff-check
       - id: ruff-format
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.26.0"
+    rev: "v2.24.1"
     hooks:
       - id: pyproject-fmt
         additional_dependencies: [tomli]

Dockerfile

@@ -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.12.5-python3.14-trixie-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.11.19-python3.12-trixie-slim AS s6-overlay-base
 
 WORKDIR /usr/src/s6
 
@@ -238,10 +238,6 @@ RUN set -eux \
     && chown --from root:root --changes --recursive paperless:paperless /usr/src/paperless \
   && echo "Making fontconfig cache writable for arbitrary container UIDs" \
     && chmod 1777 /var/cache/fontconfig \
-  && echo "Making /run world-writable for rootless operation" \
-    && chmod 1777 /run \
-  && echo "Removing setuid from s6-overlay-suexec for rootless compat" \
-    && chmod u-s /command/s6-overlay-suexec \
   && echo "Collecting static files" \
     && PAPERLESS_SECRET_KEY=build-time-dummy s6-setuidgid paperless python3 manage.py collectstatic --clear --no-input --link \
     && PAPERLESS_SECRET_KEY=build-time-dummy s6-setuidgid paperless python3 manage.py compilemessages \

docker/compose/docker-compose.ci-test.yml

@@ -4,7 +4,7 @@
 # correct networking for the tests
 services:
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.34
+    image: docker.io/gotenberg/gotenberg:8.33
     hostname: gotenberg
     container_name: gotenberg
     network_mode: host
@@ -24,7 +24,7 @@ services:
     network_mode: host
     restart: unless-stopped
   greenmail:
-    image: docker.io/greenmail/standalone:2.1.11
+    image: docker.io/greenmail/standalone:2.1.8
     hostname: greenmail
     container_name: greenmail
     environment:
@@ -35,7 +35,7 @@ services:
       - "3143:3143" # IMAP
     restart: unless-stopped
   nginx:
-    image: docker.io/nginx:1.31.3-alpine
+    image: docker.io/nginx:1.31.1-alpine
     hostname: nginx
     container_name: nginx
     ports:

docker/compose/docker-compose.mariadb-tika.yml

@@ -72,7 +72,7 @@ services:
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.34
+    image: docker.io/gotenberg/gotenberg:8.33
     restart: unless-stopped
     # The gotenberg chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even javascript.

docker/compose/docker-compose.portainer.yml

@@ -56,7 +56,7 @@ services:
     environment:
       PAPERLESS_REDIS: redis://broker:6379
       PAPERLESS_DBHOST: db
-      PAPERLESS_DBENGINE: postgresql
+      PAPERLESS_DBENGINE: postgres
     env_file:
       - stack.env
 volumes:

docker/compose/docker-compose.postgres-tika.yml

@@ -67,7 +67,7 @@ services:
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.34
+    image: docker.io/gotenberg/gotenberg:8.33
     restart: unless-stopped
     # The gotenberg chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even javascript.

docker/compose/docker-compose.sqlite-tika.yml

@@ -56,7 +56,7 @@ services:
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.34
+    image: docker.io/gotenberg/gotenberg:8.33
     restart: unless-stopped
     # The gotenberg chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even javascript.

docker/rootfs/etc/ImageMagick-6/paperless-policy.xml

@@ -68,14 +68,7 @@
   <!-- <policy domain="resource" name="thread" value="4"/> -->
   <!-- <policy domain="resource" name="throttle" value="0"/> -->
   <!-- <policy domain="resource" name="time" value="3600"/> -->
-  <!-- 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="coder" rights="none" pattern="MVG" /> -->
   <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
   <!-- <policy domain="path" rights="none" pattern="@*" /> -->
@@ -85,6 +78,8 @@
   <!-- <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" />

docker/rootfs/etc/s6-overlay/s6-rc.d/init-llmindex-migrate/run

@@ -1,12 +0,0 @@
-#!/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

docker/rootfs/etc/s6-overlay/s6-rc.d/init-llmindex-migrate/type

@@ -1 +0,0 @@
-oneshot

docker/rootfs/etc/s6-overlay/s6-rc.d/init-llmindex-migrate/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-llmindex-migrate/run

docs/administration.md

@@ -151,23 +151,6 @@ the background.
 
 ### Bare Metal Route {#bare-metal-updating}
 
-!!! warning
-
-    Extracting a new release archive on top of an existing installation
-    (e.g. `tar -xf paperless-ngx-vX.Y.Z.tar.xz -C /opt/paperless`) only adds
-    and overwrites files -- it does not remove files that were deleted in
-    the new release. Leftover files from an old version, such as
-    superseded database migrations, can remain on disk and cause errors
-    like `NodeNotFoundError` during `manage.py migrate`.
-
-    Before unpacking a new release over an existing bare-metal
-    installation, remove the previous source tree first (everything
-    except your `media`, `data`, and `consume` directories and your
-    `paperless.conf`/`.env`), or unpack into a fresh directory and move
-    your persistent data and configuration over. Installations updated via
-    `git pull` on a clean checkout are not affected, since Git removes
-    files that no longer exist upstream.
-
 After grabbing the new release and unpacking the contents, do the
 following:
 
@@ -212,16 +195,6 @@ 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
@@ -299,8 +272,6 @@ optional arguments:
 -sm, --split-manifest
 -z,  --zip
 -zn, --zip-name
---zip-compression
---zip-compression-level
 --data-only
 --no-progress-bar
 --passphrase
@@ -363,19 +334,6 @@ 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.
 
@@ -557,7 +515,7 @@ index is updated automatically on the schedule set by
 can manage it manually:
 
 ```
-document_llmindex {rebuild,update,compact,migrate}
+document_llmindex {rebuild,update,compact}
 ```
 
 Specify `rebuild` to build the index from scratch from all documents in the database. Use
@@ -714,7 +672,6 @@ 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
 

docs/api.md

@@ -227,7 +227,6 @@ 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.
 

docs/configuration.md

@@ -522,36 +522,22 @@ do CORS calls. Set this to your public domain name.
 fail2ban with log entries for failed authorization attempts. Value should be
 IP address(es).
 
-    By default, this setting also controls allauth's trusted proxy count,
-    which is set to the number of proxies listed here. Override that default
-    with [`PAPERLESS_ALLAUTH_TRUSTED_PROXY_COUNT`](#PAPERLESS_ALLAUTH_TRUSTED_PROXY_COUNT)
-    when the list length does not match the number of proxy hops.
+    This setting also controls allauth's
+    [`ALLAUTH_TRUSTED_PROXY_COUNT`](https://docs.allauth.org/en/latest/account/configuration.html),
+    which is set to the number of proxies listed here. Without this,
+    allauth cannot determine the client IP address for rate limiting when
+    running behind a reverse proxy, resulting in a `403 Forbidden` on login.
 
     Defaults to empty string.
 
-#### [`PAPERLESS_ALLAUTH_TRUSTED_PROXY_COUNT=<integer>`](#PAPERLESS_ALLAUTH_TRUSTED_PROXY_COUNT) {#PAPERLESS_ALLAUTH_TRUSTED_PROXY_COUNT}
-
-: Sets allauth's
-[`ALLAUTH_TRUSTED_PROXY_COUNT`](https://docs.allauth.org/en/latest/common/rate_limits.html#configuration).
-This is the number of trusted proxy **hops** represented in each
-`X-Forwarded-For` header, not the number of IP addresses through which those
-proxies may be reached. For example, a single dual-stack proxy is one hop even
-when its IPv4 and IPv6 addresses are both listed in
-[`PAPERLESS_TRUSTED_PROXIES`](#PAPERLESS_TRUSTED_PROXIES).
-
-    Only trust `X-Forwarded-For` when untrusted clients cannot connect directly
-    to Paperless-ngx.
-
-    Defaults to the number of entries in `PAPERLESS_TRUSTED_PROXIES`.
-
 #### [`PAPERLESS_ALLAUTH_TRUSTED_CLIENT_IP_HEADER=<header-name>`](#PAPERLESS_ALLAUTH_TRUSTED_CLIENT_IP_HEADER) {#PAPERLESS_ALLAUTH_TRUSTED_CLIENT_IP_HEADER}
 
 : Sets allauth's
-[`ALLAUTH_TRUSTED_CLIENT_IP_HEADER`](https://docs.allauth.org/en/latest/common/rate_limits.html#configuration).
+[`ALLAUTH_TRUSTED_CLIENT_IP_HEADER`](https://docs.allauth.org/en/latest/account/configuration.html).
 Use this when your reverse proxy sets a dedicated header for the real
 client IP instead of `X-Forwarded-For`, for example `X-Real-IP` (nginx)
 or `CF-Connecting-IP` (Cloudflare). When set, this takes precedence over
-`PAPERLESS_ALLAUTH_TRUSTED_PROXY_COUNT`.
+[`PAPERLESS_TRUSTED_PROXIES`](#PAPERLESS_TRUSTED_PROXIES).
 
     Defaults to none.
 
@@ -776,24 +762,6 @@ 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.
@@ -950,8 +918,8 @@ for display in the web interface.
     | Document type              | `never` | `auto` (default)           | `always` |
     | -------------------------- | ------- | -------------------------- | -------- |
     | Scanned image (TIFF, JPEG) | No      | **Yes**                    | Yes      |
-    | Image-based PDF            | No      | **Yes** (no embedded text) | Yes |
-    | Born-digital PDF           | No      | No (has embedded text, optionally confirmed by tag) | Yes |
+    | Image-based PDF            | No      | **Yes** (short/no text, untagged) | Yes |
+    | Born-digital PDF           | No      | No (tagged or has embedded text)  | Yes |
     | Plain text, email, HTML    | No      | No                         | No       |
     | DOCX / ODT (via Tika)      | Yes\*   | Yes\*                      | Yes\*    |
 
@@ -966,11 +934,10 @@ for display in the web interface.
 
     !!! note
 
-        The **remote OCR parser** (Azure AI) also honors this setting: when
-        no archive is requested (`never`, or `auto` with a born-digital PDF),
-        the remote engine is skipped entirely and locally-extracted text is
-        used instead, avoiding an unnecessary API call and a duplicate text
-        layer.
+        The **remote OCR parser** (Azure AI) always produces a searchable
+        PDF and stores it as the archive copy, regardless of this setting.
+        `ARCHIVE_FILE_GENERATION=never` has no effect when the remote
+        parser handles a document.
 
 #### [`PAPERLESS_OCR_CLEAN=<mode>`](#PAPERLESS_OCR_CLEAN) {#PAPERLESS_OCR_CLEAN}
 
@@ -1192,21 +1159,19 @@ still perform some basic text pre-processing before matching.
 
 #### [`PAPERLESS_DATE_PARSER_LANGUAGES=<lang>`](#PAPERLESS_DATE_PARSER_LANGUAGES) {#PAPERLESS_DATE_PARSER_LANGUAGES}
 
-: Specifies which language Paperless should use when parsing dates from documents.
+Specifies which language Paperless should use when parsing dates from documents.
 
-: This should be a language code supported by the dateparser library,
-for example: "en", or a combination such as "en+de".
-Locales are also supported (e.g., "en-AU").
-Multiple languages can be combined using "+", for example: "en+de" or "en-AU+de".
-For valid values, refer to the list of supported languages and locales in the [dateparser documentation](https://dateparser.readthedocs.io/en/latest/supported_locales.html).
-
-: Set this to match the languages in which most of your documents are written.
+    This should be a language code supported by the dateparser library,
+    for example: "en", or a combination such as "en+de".
+    Locales are also supported (e.g., "en-AU").
+    Multiple languages can be combined using "+", for example: "en+de" or "en-AU+de".
+    For valid values, refer to the list of supported languages and locales in the [dateparser documentation](https://dateparser.readthedocs.io/en/latest/supported_locales.html).
 
+    Set this to match the languages in which most of your documents are written.
     If not set, Paperless will attempt to infer the language(s) from the OCR configuration (`PAPERLESS_OCR_LANGUAGE`).
 
-    !!! note
-
-        This format differs from the `PAPERLESS_OCR_LANGUAGE` setting, which uses ISO 639-2 codes (3 letters, e.g., "eng+deu" for Tesseract OCR).
+!!! note
+This format differs from the `PAPERLESS_OCR_LANGUAGE` setting, which uses ISO 639-2 codes (3 letters, e.g., "eng+deu" for Tesseract OCR).
 
 #### [`PAPERLESS_EMAIL_TASK_CRON=<cron expression>`](#PAPERLESS_EMAIL_TASK_CRON) {#PAPERLESS_EMAIL_TASK_CRON}
 
@@ -1379,16 +1344,13 @@ 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.search()`. Use `^` to anchor a pattern to the start of the filename and `$` to anchor it to the end.
+using Python's `re.match()`, which anchors at the start of the filename.
 
     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
@@ -1403,11 +1365,7 @@ using Python's `re.search()`. Use `^` to anchor a pattern to the start of the fi
 
     Defaults to `[]` (empty list, uses only built-in defaults).
 
-    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$"]
-    ```
+    The default ignores are `[.DS_Store, .DS_STORE, ._*, desktop.ini, Thumbs.db]` and cannot be overridden.
 
 #### [`PAPERLESS_CONSUMER_IGNORE_DIRS=<json>`](#PAPERLESS_CONSUMER_IGNORE_DIRS) {#PAPERLESS_CONSUMER_IGNORE_DIRS}
 
@@ -2161,7 +2119,7 @@ used with the OpenAI-compatible backend to target a custom provider or local gat
 
     Defaults to None.
 
-#### [`PAPERLESS_AI_LLM_OUTPUT_LANGUAGE=<str>`](#PAPERLESS_AI_LLM_OUTPUT_LANGUAGE) {#PAPERLESS_AI_LLM_OUTPUT_LANGUAGE}
+### [`PAPERLESS_AI_LLM_OUTPUT_LANGUAGE=<str>`](#PAPERLESS_AI_LLM_OUTPUT_LANGUAGE) {#PAPERLESS_AI_LLM_OUTPUT_LANGUAGE}
 
 : The language to use for AI suggestions (results may vary by LLM model). If not supplied, defaults to the user's UI language setting or None.
 

docs/migration-v3.md

@@ -133,7 +133,7 @@ PAPERLESS_DB_OPTIONS="sslmode=require,sslrootcert=/certs/ca.pem,pool.max_size=10
 
 ## OCR and Archive File Generation Settings
 
-The settings that control OCR behaviour and archive file generation have been redesigned. The old settings that coupled these two concerns together are **removed** - old values are not silently honoured; a startup warning is logged if any removed variable is still set in your environment.
+The settings that control OCR behaviour and archive file generation have been redesigned. The old settings that coupled these two concerns together are **removed** — old values are not silently honoured; a startup warning is logged if any removed variable is still set in your environment.
 
 ### Removed settings
 
@@ -166,7 +166,7 @@ Remove any `PAPERLESS_OCR_SKIP_ARCHIVE_FILE` variable from your environment. If
 # v2: skip OCR when text present, always archive
 PAPERLESS_OCR_MODE=skip
 # v3: equivalent (auto is the new default)
-# No change needed - auto is the default
+# No change needed — auto is the default
 
 # v2: skip OCR when text present, skip archive too
 PAPERLESS_OCR_MODE=skip_noarchive
@@ -187,13 +187,12 @@ PAPERLESS_ARCHIVE_FILE_GENERATION=auto
 
 ### Remote OCR parser
 
-If you use the **remote OCR parser** (Azure AI), `ARCHIVE_FILE_GENERATION` is
-honored the same way as for the local engine: when no archive is requested
-(`never`, or `auto` with a born-digital PDF), the remote engine is skipped
-entirely and locally-extracted text is used instead, avoiding an unnecessary
-API call and a duplicate text layer.
+If you use the **remote OCR parser** (Azure AI), note that it always produces a
+searchable PDF and stores it as the archive copy. `ARCHIVE_FILE_GENERATION=never`
+has no effect for documents handled by the remote parser — the archive is produced
+unconditionally by the remote engine.
 
-## Search Index (Whoosh -> Tantivy)
+# Search Index (Whoosh -> Tantivy)
 
 The full-text search backend has been replaced with [Tantivy](https://github.com/quickwit-oss/tantivy).
 The index format is incompatible with Whoosh, so **the search index is automatically rebuilt from
@@ -325,74 +324,5 @@ option since v1.8.0.
 Allauth changed how it determines the client IP address for login rate limiting. Users running
 behind a reverse proxy may need to set
 [`PAPERLESS_TRUSTED_PROXIES`](configuration.md#PAPERLESS_TRUSTED_PROXIES),
-[`PAPERLESS_ALLAUTH_TRUSTED_PROXY_COUNT`](configuration.md#PAPERLESS_ALLAUTH_TRUSTED_PROXY_COUNT),
 [`PAPERLESS_ALLAUTH_TRUSTED_CLIENT_IP_HEADER`](configuration.md#PAPERLESS_ALLAUTH_TRUSTED_CLIENT_IP_HEADER),
-or a combination of these settings to avoid `403 Forbidden` errors on login.
-The proxy count is the number of proxy hops in `X-Forwarded-For`, which may
-differ from the number of configured proxy IP addresses.
-
-## Minimum CPU Requirements (NumPy Baseline)
-
-Starting with NumPy 2.4.0, official `manylinux` x86_64 wheels are compiled with a minimum
-CPU baseline of `x86-64-v2`, which requires SSE3, SSSE3, SSE4.1, SSE4.2, POPCNT, and
-CMPXCHG16B. This is a [deliberate upstream change](https://github.com/numpy/numpy/issues/27851)
-citing that these instructions have been present in over 99.7% of CPUs since 2008
-([Intel](<https://en.wikipedia.org/wiki/Nehalem_(microarchitecture)>)) or 2011
-([AMD](<https://en.wikipedia.org/wiki/Bulldozer_(microarchitecture)>)).
-
-NumPy is a dependency of the document classifier (via scikit-learn), so any CPU that
-predates SSE4.2 support will crash with `SIGILL` (illegal instruction) when the classifier
-is loaded or trained, regardless of whether AI features are enabled.
-
-This differs from NumPy's optional SIMD dispatch (e.g. AVX2, AVX512), which is detected and
-selected safely at runtime - the `x86-64-v2` requirement above is a hard floor baked into the
-wheel, with no runtime fallback.
-
-### Affected hardware
-
-CPUs older than roughly 2008 (Intel) or 2011 (AMD) that lack SSE4.2 support. This is more
-likely to affect low-power or embedded hardware - e.g. early Atom, Celeron, or pre-Bulldozer
-AMD chips - than typical desktop or server hardware from the last decade.
-
-Check for SSE4.2 support with:
-
-```bash
-grep -o -m1 sse4_2 /proc/cpuinfo
-```
-
-If this prints nothing, your CPU is affected.
-
-### Symptoms
-
-The Celery worker (and potentially the web server) repeatedly crashes and restarts with a
-`SIGILL` error, typically visible in `dmesg`/`journalctl` as a `trap invalid opcode` inside
-`_multiarray_umath...so`. Because the classifier is trained on a periodic schedule
-(hourly, by default), affected instances see intermittent, hard-to-reproduce document
-consumption failures whenever that scheduled task runs and takes down the worker process
-mid-task.
-
-### Action Required (for affected hardware only)
-
-There is no way to make the classifier itself work on such CPUs - it requires an unofficial
-NumPy build with `cpu-baseline=none`, which is not something we can ship. The practical
-path forward is to stop the classifier from ever loading or training, which avoids
-importing NumPy at all:
-
-```bash
-PAPERLESS_TRAIN_TASK_CRON=disable
-```
-
-This disables the periodic classifier training task (see
-[`PAPERLESS_TRAIN_TASK_CRON`](configuration.md#PAPERLESS_TRAIN_TASK_CRON)). Automatic
-matching based on the classifier (suggested correspondents, document types, tags, and
-storage paths from trained rules) will no longer be available, but rule-based matching is
-unaffected, and document consumption itself will no longer be at risk of crashing the
-worker.
-
-## Database Migrations
-
-Some integer fields have been changed to smaller types to reduce database size. If you have any `MailRule` records with a `maximum_age` greater than 32767, they will be clamped to 32767 during the migration to avoid errors during migration.
-
-### Action Required
-
-No user action is required. The migration will automatically clamp any `MailRule.maximum_age` values greater than 32767 to 32767 during the migration process.
+or both, to avoid `403 Forbidden` errors on login.

docs/setup.md

@@ -142,7 +142,7 @@ a [superuser](usage.md#superusers) account.
 
     It is not possible to run the container rootless if additional languages are specified via `PAPERLESS_OCR_LANGUAGES`.
 
-If you want to run Paperless as a rootless container, set `user:` in `docker-compose.yml` to the UID and GID of your host user (use `id -u` and `id -g` to find these values). The container process starts directly as that user with no internal privilege remapping. Any UID and GID is supported:
+If you want to run Paperless as a rootless container, set `user:` in `docker-compose.yml` to the UID and GID of your host user (use `id -u` and `id -g` to find these values). The container process starts directly as that user with no internal privilege remapping:
 
 ```yaml
 webserver:
@@ -157,8 +157,8 @@ Do not combine this with `USERMAP_UID` or `USERMAP_GID`, which are intended for
 Some file systems, such as NFS network shares, don't support file system
 notifications with `inotify`. When the consumption directory is on such a
 file system, Paperless-ngx will not pick up new files with the default
-configuration. Set [`PAPERLESS_CONSUMER_POLLING_INTERVAL`](configuration.md#PAPERLESS_CONSUMER_POLLING_INTERVAL)
-to a positive number to enable polling and disable native filesystem notifications.
+configuration. Use [`PAPERLESS_CONSUMER_POLLING`](configuration.md#PAPERLESS_CONSUMER_POLLING)
+to enable polling and disable inotify. See [here](configuration.md#polling).
 
 ## Bare Metal Install {#bare_metal}
 
@@ -262,14 +262,6 @@ to a positive number to enable polling and disable native filesystem notificatio
     and copy the contents to the home directory of the user you created
     earlier (`/opt/paperless`).
 
-    !!! note
-
-        If you are updating an existing bare-metal installation rather than
-        installing for the first time, see the
-        [bare metal update instructions](administration.md#bare-metal-updating)
-        instead -- extracting a new release on top of an old one can leave
-        behind stale files from the previous version.
-
     Optional: If you cloned the Git repository, you will need to
     compile the frontend yourself. See [here](development.md#front-end-development)
     and use the `build` step, not `serve`.
@@ -416,15 +408,22 @@ 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 and disable
-    formats that Paperless-ngx does not use. Most distributions disable PDF
-    processing by default, since PDF documents can contain malware. If you
-    don't enable it, Paperless-ngx will fall back to Ghostscript for certain
-    steps such as thumbnail generation.
+12. Configure ImageMagick to allow processing of PDF documents. Most
+    distributions have this disabled by default, since PDF documents can
+    contain malware. If you don't do this, Paperless-ngx will fall back to
+    Ghostscript for certain steps such as thumbnail generation.
 
-    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.
+    Edit `/etc/ImageMagick-6/policy.xml` and adjust
+
+    ```
+    <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

docs/usage.md

@@ -99,10 +99,6 @@ 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
 
@@ -462,8 +458,8 @@ For related metadata such as tags, correspondents, document types, and storage p
 ### Password reset
 
 In order to enable the password reset feature you will need to setup an SMTP backend, see
-[`PAPERLESS_EMAIL_HOST`](configuration.md#PAPERLESS_EMAIL_HOST). You should also set
-[`PAPERLESS_URL`](configuration.md#PAPERLESS_URL) and / or its corresponding configuration settings.
+[`PAPERLESS_EMAIL_HOST`](configuration.md#PAPERLESS_EMAIL_HOST). If your installation does not have
+[`PAPERLESS_URL`](configuration.md#PAPERLESS_URL) set, the reset link included in emails will use the server host.
 
 ### Two-factor authentication
 
@@ -580,9 +576,7 @@ 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, 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.
+- Custom fields. Note that no value for the field will be set
 
 ##### Removal {#workflow-action-removal}
 
@@ -626,34 +620,6 @@ 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/).
@@ -867,10 +833,10 @@ contract you signed 8 years ago).
 
 When you search paperless for a document, it tries to match this query
 against your documents. Paperless will look for matching documents by
-inspecting their content, title, correspondent, type, and tags. Paperless
-returns a scored list of results, so that documents matching your query
-better will appear further up in the search results. Notes and custom field
-values can be searched using the advanced search syntax described below.
+inspecting their content, title, correspondent, type, tags, notes, and
+custom field values. Paperless returns a scored list of results, so that
+documents matching your query better will appear further up in the search
+results.
 
 By default, paperless returns only documents which contain all words
 typed in the search bar. A few things to know about how matching works:
@@ -925,9 +891,9 @@ Supported date keywords: `today`, `yesterday`, `previous week`,
 
 #### Searching custom fields
 
-Custom field names and values are included in the full-text index, but they
-are not searched by a plain, unqualified query. Use the advanced search syntax
-to search by field name or value:
+Custom field values are included in the full-text index, so a plain search
+already matches documents whose custom field values contain your search terms.
+To narrow by field name or value specifically:
 
 ```
 custom_fields.value:policy
@@ -955,9 +921,8 @@ custom_fields.name:"Contract Number" custom_fields.value:1312
 
 #### Searching notes
 
-Notes are included in the full-text index, but they are not searched by a
-plain, unqualified query. Use the advanced search syntax to search by note
-author or content:
+Notes content is included in full-text search automatically. To search
+by note author or content specifically:
 
 ```
 notes.user:alice

paperless.conf.example

@@ -34,8 +34,6 @@ 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
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "paperless-ngx"
-version = "3.0.5"
+version = "3.0.0"
 description = "A community-supported supercharged document management system: scan, index and archive all your physical documents"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -16,12 +16,12 @@ classifiers = [
 dependencies = [
   "azure-ai-documentintelligence>=1.0.2",
   "babel>=2.17",
-  "bleach~=6.4.0",
+  "bleach~=6.3.0",
   "celery[redis]~=5.6.2",
   "channels~=4.2",
   "channels-redis~=4.2",
   "concurrent-log-handler~=0.9.25",
-  "dateparser~=1.4",
+  "dateparser~=1.2",
   # WARNING: django does not use semver.
   #          Only patch versions are guaranteed to not introduce breaking changes.
   "django~=5.2.13",
@@ -32,32 +32,33 @@ dependencies = [
   "django-cors-headers~=4.9.0",
   "django-extensions~=4.1",
   "django-filter~=25.1",
-  "django-guardian~=3.3.3",
+  "django-guardian~=3.3.0",
   "django-multiselectfield~=1.0.1",
   "django-rich~=2.2.0",
   "django-soft-delete~=1.0.18",
   "django-treenode>=0.24",
   "djangorestframework~=3.16",
-  "drf-spectacular~=0.30",
-  "drf-spectacular-sidecar~=2026.7.1",
+  "djangorestframework-guardian~=0.4.0",
+  "drf-spectacular~=0.28",
+  "drf-spectacular-sidecar~=2026.5.1",
   "drf-writable-nested~=0.7.1",
-  "filelock~=3.32.0",
+  "filelock~=3.29.0",
   "flower~=2.0.1",
   "gotenberg-client~=0.14.0",
-  "httpx-oauth~=0.17",
-  "ijson>=3.5.1",
-  "imap-tools~=1.14.0",
+  "httpx-oauth~=0.16",
+  "ijson>=3.2",
+  "imap-tools~=1.13.0",
   "jinja2~=3.1.5",
   "langdetect~=1.0.9",
-  "llama-index-core>=0.14.23",
+  "llama-index-core>=0.14.22",
   "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.7.0",
-  "openai>=2.48",
+  "nltk~=3.9.1",
+  "ocrmypdf~=17.4.2",
+  "openai>=2.32",
   "pathvalidate~=3.3.1",
   "pdf2image~=1.17.0",
   "python-dateutil~=2.9.0",
@@ -67,26 +68,26 @@ dependencies = [
   "python-magic~=0.4.27",
   "rapidfuzz~=3.14.5",
   "redis[hiredis]~=5.2.1",
-  "regex>=2026.7.19",
-  "scikit-learn~=1.9.0",
-  "sentence-transformers>=5.6.1",
+  "regex>=2026.4.4",
+  "scikit-learn~=1.8.0",
+  "sentence-transformers>=5.4.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.2",
+  "torch~=2.12.0",
+  "watchfiles>=1.1.1",
   "whitenoise~=6.11",
-  "zxing-cpp~=3.1.0",
+  "zxing-cpp~=3.0.0",
 ]
 [project.optional-dependencies]
 mariadb = [
   "mysqlclient~=2.2.7",
 ]
 postgres = [
-  "psycopg[c,pool]==3.3.4",
+  "psycopg[c,pool]==3.3",
   # Direct dependency for proper resolution of the pre-built wheels
-  "psycopg-c==3.3.4",
+  "psycopg-c==3.3",
   "psycopg-pool==3.3.1",
 ]
 webserver = [
@@ -100,25 +101,25 @@ dev = [
   { include-group = "testing" },
 ]
 docs = [
-  "zensical>=0.0.51",
+  "zensical>=0.0.43",
 ]
 lint = [
-  "prek~=0.4.11",
-  "ruff~=0.16.1",
+  "prek~=0.3.10",
+  "ruff~=0.15.15",
 ]
 testing = [
   "daphne",
   "factory-boy~=3.3.1",
-  "faker~=40.36.0",
+  "faker~=40.15.0",
   "imagehash",
-  "pytest~=9.1.1",
+  "pytest~=9.0.3",
   "pytest-cov~=7.1.0",
   "pytest-django~=4.12.0",
-  "pytest-env~=1.7.0",
+  "pytest-env~=1.6.0",
   "pytest-httpx",
   "pytest-mock~=3.15.1",
   # "pytest-randomly~=4.0.1",
-  "pytest-rerunfailures~=16.4",
+  "pytest-rerunfailures~=16.1",
   "pytest-sugar",
   "pytest-xdist~=3.8.0",
   "time-machine>=2.13",
@@ -160,10 +161,8 @@ 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.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.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'" },
+  { 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.0/psycopg_c-3.3.0-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
 ]
 torch = [
   { index = "pytorch-cpu" },
@@ -184,7 +183,6 @@ 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

src-ui/angular.json

@@ -56,13 +56,13 @@
       },
       "architect": {
         "build": {
-          "builder": "@angular/build:application",
+          "builder": "@angular-builders/custom-webpack:browser",
           "options": {
-            "outputPath": {
-              "base": "dist/paperless-ui",
-              "browser": ""
+            "customWebpackConfig": {
+                "path": "./extra-webpack.config.ts"
             },
-            "browser": "src/main.ts",
+            "outputPath": "dist/paperless-ui",
+            "main": "src/main.ts",
             "outputHashing": "none",
             "index": "src/index.html",
             "polyfills": [
@@ -79,16 +79,6 @@
                 "glob": "{pdf.worker.min.mjs,pdf.min.mjs}",
                 "input": "node_modules/pdfjs-dist/legacy/build/",
                 "output": "/assets/js/"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/pdfjs-dist/wasm/",
-                "output": "/assets/wasm/"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/pdfjs-dist/iccs/",
-                "output": "/assets/iccs/"
               }
             ],
             "styles": [
@@ -97,7 +87,6 @@
             "scripts": [],
             "allowedCommonJsDependencies": [
               "file-saver",
-              "mime-names",
               "utif"
             ],
             "extractLicenses": false,
@@ -118,13 +107,11 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
-              "outputPath": {
-                "base": "../src/documents/static/frontend/",
-                "browser": ""
-              },
+              "outputPath": "../src/documents/static/frontend/",
               "optimization": true,
               "outputHashing": "none",
               "sourceMap": false,
+              "namedChunks": false,
               "extractLicenses": true,
               "budgets": [
                 {
@@ -148,7 +135,7 @@
           "defaultConfiguration": ""
         },
         "serve": {
-          "builder": "@angular/build:dev-server",
+          "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
             "buildTarget": "paperless-ui:build:en-US"
           },
@@ -159,7 +146,7 @@
           }
         },
         "extract-i18n": {
-          "builder": "@angular/build:extract-i18n",
+          "builder": "@angular-builders/custom-webpack:extract-i18n",
           "options": {
             "buildTarget": "paperless-ui:build"
           }

src-ui/e2e/document-detail/document-detail.spec.ts

@@ -1,4 +1,4 @@
-import { expect, test, type WebSocketRoute } from '@playwright/test'
+import { expect, test } from '@playwright/test'
 import path from 'node:path'
 
 const REQUESTS_HAR = path.join(__dirname, 'requests/api-document-detail.har')
@@ -95,60 +95,3 @@ test('should support quick filters', async ({ page }) => {
     .click()
   await expect(page).toHaveURL(/tags__id__all=4&sort=created&reverse=1&page=1/)
 })
-
-test('should finish reloading the preview after a remote document update', async ({
-  page,
-}) => {
-  let resolveStatusSocket: (socket: WebSocketRoute) => void
-  const statusSocketReady = new Promise<WebSocketRoute>((resolve) => {
-    resolveStatusSocket = resolve
-  })
-  await page.routeWebSocket(/\/ws\/status\/$/, (socket) => {
-    resolveStatusSocket(socket)
-  })
-  await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
-  let previewRequestCount = 0
-  page.on('request', (request) => {
-    if (request.url().includes('/api/documents/175/preview/')) {
-      previewRequestCount++
-    }
-  })
-  await page.goto('/documents/175/details')
-
-  await page.locator('pngx-document-detail').waitFor()
-  await expect(page.getByTitle('Storage path', { exact: true })).toHaveText(
-    /\w+/
-  )
-  const previewWasLoaded = await page.evaluate(() => {
-    const detail = document.querySelector('pngx-document-detail')
-    const component = (window as any).ng.getComponent(detail)
-    component.pdfPreviewLoaded({ numPages: 1 })
-    return component.previewLoaded()
-  })
-  expect(previewWasLoaded).toBe(true)
-  const previewRequestsBeforeReload = previewRequestCount
-
-  const statusSocket = await statusSocketReady
-  const documentReloaded = page.waitForResponse(
-    (response) =>
-      response.url().includes('/api/documents/175/?full_perms=true') &&
-      response.request().method() === 'GET'
-  )
-  statusSocket.send(
-    JSON.stringify({
-      type: 'document_updated',
-      data: {
-        document_id: 175,
-        modified: '2026-07-26T20:00:00Z',
-      },
-    })
-  )
-  await documentReloaded
-
-  await expect(
-    page.getByText('Document reloaded with latest changes.').first()
-  ).toBeVisible()
-  await expect
-    .poll(() => previewRequestCount)
-    .toBeGreaterThan(previewRequestsBeforeReload + 1)
-})

src-ui/extra-webpack.config.ts

@@ -0,0 +1,24 @@
+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
+}

src-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperless-ngx-ui",
-  "version": "3.0.5",
+  "version": "3.0.0",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "ng": "ng",
@@ -11,21 +11,21 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/cdk": "^22.1.1",
-    "@angular/common": "~22.1.1",
-    "@angular/compiler": "~22.1.1",
-    "@angular/core": "~22.1.1",
-    "@angular/forms": "~22.1.1",
-    "@angular/localize": "~22.1.1",
-    "@angular/platform-browser": "~22.1.1",
-    "@angular/router": "~22.1.1",
+    "@angular/cdk": "^22.0.3",
+    "@angular/common": "~22.0.5",
+    "@angular/compiler": "~22.0.5",
+    "@angular/core": "~22.0.5",
+    "@angular/forms": "~22.0.5",
+    "@angular/localize": "~22.0.5",
+    "@angular/platform-browser": "~22.0.5",
+    "@angular/platform-browser-dynamic": "~22.0.5",
+    "@angular/router": "~22.0.5",
     "@ng-bootstrap/ng-bootstrap": "^21.0.0",
-    "@ng-select/ng-select": "~23.6.0",
+    "@ng-select/ng-select": "^23.2.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",
@@ -33,40 +33,42 @@
     "ngx-device-detector": "^12.0.0",
     "ngx-ui-tour-ng-bootstrap": "^19.0.0",
     "normalize-diacritics": "^5.0.0",
-    "pdfjs-dist": "^6.2.108",
+    "pdfjs-dist": "^6.0.227",
     "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.1.3",
-    "@angular-devkit/schematics": "^22.1.3",
-    "@angular-eslint/builder": "22.1.0",
-    "@angular-eslint/eslint-plugin": "22.1.0",
-    "@angular-eslint/eslint-plugin-template": "22.1.0",
-    "@angular-eslint/schematics": "22.1.0",
-    "@angular-eslint/template-parser": "22.1.0",
-    "@angular/build": "22.1.3",
-    "@angular/cli": "22.1.3",
-    "@angular/compiler-cli": "~22.1.1",
-    "@playwright/test": "^1.62.1",
+    "@angular-devkit/core": "^22.0.5",
+    "@angular-devkit/schematics": "^22.0.5",
+    "@angular-eslint/builder": "22.0.0",
+    "@angular-eslint/eslint-plugin": "22.0.0",
+    "@angular-eslint/eslint-plugin-template": "22.0.0",
+    "@angular-eslint/schematics": "22.0.0",
+    "@angular-eslint/template-parser": "22.0.0",
+    "@angular/build": "^22.0.5",
+    "@angular/cli": "~22.0.5",
+    "@angular/compiler-cli": "~22.0.5",
+    "@codecov/webpack-plugin": "^2.0.1",
+    "@playwright/test": "^1.61.1",
     "@types/jest": "^30.0.0",
-    "@types/node": "^26.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.67.0",
-    "@typescript-eslint/parser": "^8.67.0",
-    "@typescript-eslint/utils": "^8.67.0",
-    "eslint": "^10.8.1",
+    "@types/node": "^26.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.62.0",
+    "@typescript-eslint/parser": "^8.62.0",
+    "@typescript-eslint/utils": "^8.62.0",
+    "eslint": "^10.5.0",
     "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.2",
-    "typescript": "^6.0.3"
+    "ts-node": "~10.9.1",
+    "typescript": "^6.0.3",
+    "webpack": "^5.107.2"
   },
-  "packageManager": "pnpm@11.15.1"
+  "packageManager": "pnpm@10.26.0"
 }

src-ui/pnpm-workspace.yaml

@@ -2,11 +2,6 @@ packages:
   - "."
 minimumReleaseAge: 10080
 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

src-ui/src/app/app-routing.module.ts

@@ -13,6 +13,8 @@ import { DocumentDetailComponent } from './components/document-detail/document-d
 import { DocumentListComponent } from './components/document-list/document-list.component'
 import { DocumentAttributesComponent } from './components/manage/document-attributes/document-attributes.component'
 import { MailComponent } from './components/manage/mail/mail.component'
+import { OcrTemplateEditorComponent } from './components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component'
+import { OcrTemplatesComponent } from './components/manage/ocr-templates/ocr-templates.component'
 import { SavedViewsComponent } from './components/manage/saved-views/saved-views.component'
 import { WorkflowsComponent } from './components/manage/workflows/workflows.component'
 import { NotFoundComponent } from './components/not-found/not-found.component'
@@ -274,6 +276,42 @@ export const routes: Routes = [
           componentName: 'WorkflowsComponent',
         },
       },
+      {
+        path: 'ocr-templates',
+        component: OcrTemplatesComponent,
+        canActivate: [PermissionsGuard],
+        data: {
+          requiredPermission: {
+            action: PermissionAction.View,
+            type: PermissionType.OcrTemplate,
+          },
+          componentName: 'OcrTemplatesComponent',
+        },
+      },
+      {
+        path: 'ocr-templates/new',
+        component: OcrTemplateEditorComponent,
+        canActivate: [PermissionsGuard],
+        data: {
+          requiredPermission: {
+            action: PermissionAction.Add,
+            type: PermissionType.OcrTemplate,
+          },
+          componentName: 'OcrTemplateEditorComponent',
+        },
+      },
+      {
+        path: 'ocr-templates/:id',
+        component: OcrTemplateEditorComponent,
+        canActivate: [PermissionsGuard],
+        data: {
+          requiredPermission: {
+            action: PermissionAction.Change,
+            type: PermissionType.OcrTemplate,
+          },
+          componentName: 'OcrTemplateEditorComponent',
+        },
+      },
       {
         path: 'mail',
         component: MailComponent,

src-ui/src/app/components/admin/logs/logs.component.html

@@ -5,9 +5,8 @@
   i18n-info>
   <div class="input-group input-group-sm align-items-center">
     <div class="input-group input-group-sm me-3">
-      <label class="input-group-text text-muted" for="logLineLimit" i18n>Show</label>
+      <span class="input-group-text text-muted" i18n>Show</span>
       <input
-        id="logLineLimit"
         class="form-control"
         type="number"
         min="100"
@@ -18,7 +17,7 @@
       <span class="input-group-text text-muted" i18n>lines</span>
     </div>
     <div class="form-check form-switch mt-1">
-      <input id="autoRefreshSwitch" class="form-check-input" type="checkbox" role="switch" [ngModel]="autoRefreshEnabled()" (ngModelChange)="autoRefreshEnabled.set($event)">
+      <input class="form-check-input" type="checkbox" role="switch" [ngModel]="autoRefreshEnabled()" (ngModelChange)="autoRefreshEnabled.set($event)">
       <label class="form-check-label" for="autoRefreshSwitch" i18n>Auto refresh</label>
     </div>
   </div>

src-ui/src/app/components/admin/logs/logs.component.ts

@@ -100,7 +100,9 @@ export class LogsComponent
             parsed.some((log, idx) => {
               const current = this.logs()[idx]
               return (
-                current?.message !== log.message || current?.level !== log.level
+                !current ||
+                current.message !== log.message ||
+                current.level !== log.level
               )
             })
           if (hasChanges) {

src-ui/src/app/components/admin/settings/settings.component.html

@@ -37,7 +37,7 @@
 
 <form [formGroup]="settingsForm" (ngSubmit)="saveSettings()">
 
-  <ul ngbNav #nav="ngbNav" (navChange)="onNavChange($event)" [activeId]="activeNavID()" (activeIdChange)="activeNavID.set($event)" class="nav-tabs">
+  <ul ngbNav #nav="ngbNav" (navChange)="onNavChange($event)" [(activeId)]="activeNavID" class="nav-tabs">
     <li [ngbNavItem]="SettingsNavIDs.General">
       <a ngbNavLink i18n>General</a>
       <ng-template ngbNavContent>
@@ -150,10 +150,10 @@
 
             <div class="row mb-3">
               <div class="col-md-3 col-form-label pt-0">
-                <label for="searchLink" i18n>Full search links to</label>
+                <span i18n>Full search links to</span>
               </div>
               <div class="col mb-3">
-                <select id="searchLink" class="form-select" formControlName="searchLink">
+                <select class="form-select" formControlName="searchLink">
                   <option [ngValue]="GlobalSearchType.TITLE_CONTENT" i18n>Title and content search</option>
                   <option [ngValue]="GlobalSearchType.ADVANCED" i18n>Advanced search</option>
                 </select>
@@ -199,10 +199,10 @@
             <h5 i18n>Documents</h5>
             <div class="row mb-3">
               <div class="col-md-3 col-form-label pt-0">
-                <label for="documentListItemPerPage" i18n>Items per page</label>
+                <span i18n>Items per page</span>
               </div>
               <div class="col">
-                <select id="documentListItemPerPage" class="form-select" formControlName="documentListItemPerPage">
+                <select class="form-select" formControlName="documentListItemPerPage">
                   <option [ngValue]="10">10</option>
                   <option [ngValue]="25">25</option>
                   <option [ngValue]="50">50</option>
@@ -274,10 +274,10 @@
             <h5 class="mt-3" i18n>PDF Editor</h5>
             <div class="row">
               <div class="col-md-3 col-form-label pt-0">
-                <label for="pdfEditorDefaultEditMode" i18n>Default editing mode</label>
+                <span i18n>Default editing mode</span>
               </div>
               <div class="col">
-                <select id="pdfEditorDefaultEditMode" class="form-select" formControlName="pdfEditorDefaultEditMode">
+                <select class="form-select" formControlName="pdfEditorDefaultEditMode">
                   <option [ngValue]="PdfEditorEditMode.Create" i18n>Create new document(s)</option>
                   <option [ngValue]="PdfEditorEditMode.Update" i18n>Add document version</option>
                 </select>
@@ -304,7 +304,7 @@
         <div class="row mb-3">
           <div class="col">
             <p i18n>
-              Settings apply to this user account for objects (Tags, Mail Rules, etc.) created via the web UI. These settings do not apply to documents.
+              Settings apply to this user account for objects (Tags, Mail Rules, etc. but not documents) created via the web UI.
             </p>
           </div>
         </div>

src-ui/src/app/components/admin/settings/settings.component.spec.ts

@@ -242,7 +242,7 @@ describe('SettingsComponent', () => {
     activatedRoute.snapshot.fragment = '#notifications'
     const scrollSpy = jest.spyOn(viewportScroller, 'scrollToAnchor')
     component.ngOnInit()
-    expect(component.activeNavID()).toEqual(4) // Notifications
+    expect(component.activeNavID).toEqual(4) // Notifications
     component.ngAfterViewInit()
     expect(scrollSpy).toHaveBeenCalledWith('#notifications')
   })
@@ -399,17 +399,17 @@ describe('SettingsComponent', () => {
     completeSetup()
     const field = 'storage_path'
     expect(
-      component.settingsForm.get('documentDetailsHiddenFields').value
-    ).toHaveLength(0)
+      component.settingsForm.get('documentDetailsHiddenFields').value.length
+    ).toEqual(0)
     component.toggleDocumentDetailField(field, false)
     expect(
-      component.settingsForm.get('documentDetailsHiddenFields').value
-    ).toHaveLength(1)
+      component.settingsForm.get('documentDetailsHiddenFields').value.length
+    ).toEqual(1)
     expect(component.isDocumentDetailFieldShown(field)).toBeFalsy()
     component.toggleDocumentDetailField(field, true)
     expect(
-      component.settingsForm.get('documentDetailsHiddenFields').value
-    ).toHaveLength(0)
+      component.settingsForm.get('documentDetailsHiddenFields').value.length
+    ).toEqual(0)
     expect(component.isDocumentDetailFieldShown(field)).toBeTruthy()
   })
 })

src-ui/src/app/components/admin/settings/settings.component.ts

@@ -142,7 +142,7 @@ export class SettingsComponent
   private systemStatusService = inject(SystemStatusService)
   private savedViewsService = inject(SavedViewService)
 
-  readonly activeNavID = signal<number>(undefined)
+  activeNavID: number
 
   settingsForm = new FormGroup({
     bulkEditConfirmationDialogs: new FormControl(null),
@@ -283,7 +283,7 @@ export class SettingsComponent
           (navID) => navID.toLowerCase() == section
         )
         if (navIDKey) {
-          this.activeNavID.set(SettingsNavIDs[navIDKey])
+          this.activeNavID = SettingsNavIDs[navIDKey]
         }
       }
     })
@@ -386,7 +386,7 @@ export class SettingsComponent
         .navigate(['settings', foundNavIDkey.toLowerCase()])
         .then((navigated) => {
           if (!navigated && this.isDirty) {
-            this.activeNavID.set(navChangeEvent.activeId)
+            this.activeNavID = navChangeEvent.activeId
           } else if (navigated && this.isDirty) {
             this.initialize()
           }

src-ui/src/app/components/admin/tasks/tasks.component.html

@@ -15,13 +15,13 @@
       <i-bs name="check2-all" class="me-1"></i-bs><ng-container i18n>Dismiss all</ng-container>
     </button>
     <div class="form-check form-switch mb-0 ms-2">
-      <input id="autoRefreshSwitch" class="form-check-input" type="checkbox" role="switch" [(ngModel)]="autoRefreshEnabled">
+      <input class="form-check-input" type="checkbox" role="switch" [(ngModel)]="autoRefreshEnabled">
       <label class="form-check-label" for="autoRefreshSwitch" i18n>Auto refresh</label>
     </div>
   </div>
 </pngx-page-header>
 
-@if (loading() && pagedTasks().length === 0) {
+@if (!tasksService.completedFileTasks && tasksService.loading) {
   <div class="spinner-border spinner-border-sm fw-normal ms-2 me-auto" role="status"></div>
   <div class="visually-hidden" i18n>Loading...</div>
 }
@@ -93,8 +93,7 @@
           <i-bs width="1em" height="1em" name="x"></i-bs>
         </button>
       }
-      <label class="visually-hidden" for="taskSearch" i18n>Search tasks</label>
-      <input #filterInput id="taskSearch" class="form-control form-control-sm" type="text"
+      <input #filterInput class="form-control form-control-sm" type="text"
         (keyup)="filterInputKeyup($event)"
         [(ngModel)]="filterText">
     </div>
@@ -212,7 +211,7 @@
                 <i-bs width="1.2em" height="1.2em" name="info-circle"></i-bs>
               </button>
             </td>
-            <td class="actions-col">
+            <td scope="row" class="actions-col">
               <div class="btn-group" role="group">
                 <button class="btn btn-sm btn-outline-secondary" (click)="dismissTask(task); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }">
                   <i-bs name="check" class="me-1"></i-bs><ng-container i18n>Dismiss</ng-container>

src-ui/src/app/components/admin/tasks/tasks.component.spec.ts

@@ -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', () => {

src-ui/src/app/components/admin/tasks/tasks.component.ts

@@ -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.set(false)
+        modal.componentInstance.buttonsEnabled = 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.set(true)
+            modal.componentInstance.buttonsEnabled = 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.set(false)
+      modal.componentInstance.buttonsEnabled = 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.set(true)
+          modal.componentInstance.buttonsEnabled = true
         },
       })
       this.clearSelection()

src-ui/src/app/components/admin/trash/trash.component.scss

@@ -2,8 +2,3 @@
 .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;
-}

src-ui/src/app/components/admin/trash/trash.component.ts

@@ -82,7 +82,7 @@ export class TrashComponent
     modal.componentInstance.confirmClicked
       .pipe(takeUntil(this.unsubscribeNotifier))
       .subscribe(() => {
-        modal.componentInstance.buttonsEnabled.set(false)
+        modal.componentInstance.buttonsEnabled = false
         this.trashService.emptyTrash([document.id]).subscribe({
           next: () => {
             this.toastService.showInfo(

src-ui/src/app/components/admin/users-groups/users-groups.component.ts

@@ -146,7 +146,7 @@ export class UsersAndGroupsComponent
     modal.componentInstance.btnClass = 'btn-danger'
     modal.componentInstance.btnCaption = $localize`Proceed`
     modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = 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.set(false)
+      modal.componentInstance.buttonsEnabled = false
       this.groupsService.delete(group).subscribe({
         next: () => {
           modal.close()

src-ui/src/app/components/app-frame/app-frame.component.html

@@ -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() || !canSaveSettings"
+                <li class="nav-item w-100 app-link" cdkDrag [cdkDragDisabled]="!settingsService.organizingSidebarSavedViews()"
                   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]="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>
+                    <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>
                         @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() && canSaveSettings) {
+                  @if (settingsService.organizingSidebarSavedViews()) {
                     <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>
@@ -150,8 +150,7 @@
                   [disablePopover]="!slimSidebarEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
                   popoverClass="popover-slim">
                   <i-bs class="me-2" name="file-text"></i-bs><span>{{d.title | documentTitle}}</span>
-                  <span class="close flex-column justify-content-center"
-                    (click)="$event.preventDefault(); $event.stopPropagation(); closeDocument(d)">
+                  <span class="close flex-column justify-content-center" (click)="closeDocument(d); $event.preventDefault()">
                     <i-bs name="x"></i-bs>
                   </span>
                 </a>
@@ -182,7 +181,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 && canSaveSettings) {
+                  @if (!slimSidebarEnabled) {
                     <button
                       type="button"
                       class="btn btn-link btn-sm text-muted p-0 me-3 attributes-expand-btn"
@@ -195,32 +194,32 @@
                   }
                 </div>
                 <div
-                  class="attributes-submenu ms-3"
+                  class="attributes-submenu ms-2"
                   [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" routerLink="attributes/tags" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" 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" routerLink="attributes/correspondents" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" 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" routerLink="attributes/documenttypes" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" 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" routerLink="attributes/storagepaths" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" 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" routerLink="attributes/customfields" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" 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>
@@ -244,6 +243,14 @@
                 <i-bs class="me-2" name="boxes"></i-bs><span><ng-container i18n>Workflows</ng-container></span>
               </a>
             </li>
+            <li class="nav-item app-link"
+              *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.OcrTemplate }">
+              <a class="nav-link" routerLink="ocr-templates" routerLinkActive="active" (click)="closeMenu()"
+                ngbPopover="OCR Templates" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
+                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
+                <i-bs class="me-2" name="file-earmark-break"></i-bs><span><ng-container i18n>OCR Templates</ng-container></span>
+              </a>
+            </li>
             <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.MailAccount }"
               tourAnchor="tour.mail">
               <a class="nav-link" routerLink="mail" routerLinkActive="active" (click)="closeMenu()" ngbPopover="Mail"

src-ui/src/app/components/app-frame/app-frame.component.scss

@@ -19,11 +19,6 @@
     height: 0.8em;
   }
 
-  .sidebar-heading,
-  .text-uppercase {
-    letter-spacing: 0.06em;
-  }
-
   .view-name {
     max-width: calc(100% - 50px)
   }
@@ -52,12 +47,11 @@
 
   .search-container {
     max-height: 4.5rem;
-    overflow: visible;
+    overflow: hidden;
     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;
@@ -86,7 +80,7 @@ main {
 
 .sidebar li.nav-item span,
 .sidebar .sidebar-heading span {
-  transition: opacity .1s ease;
+  transition: all .1s ease;
 }
 
 @media(min-width: 768px) {
@@ -154,7 +148,7 @@ main {
     z-index: 996;
     --bs-btn-padding-x: 0.35rem;
     --bs-btn-padding-y: 0.125rem;
-    transition: left .2s ease;
+    transition: all .2s ease;
   }
 
   .sidebar.slim .sidebar-slim-toggler {
@@ -186,8 +180,6 @@ 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);
@@ -200,7 +192,6 @@ main {
 
   &.active {
     font-weight: bold;
-    border-left-color: var(--bs-primary);
   }
 
   i-bs {
@@ -209,17 +200,6 @@ 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;
@@ -300,52 +280,10 @@ main {
   }
 }
 
-@media screen and (max-width: 575.98px) {
-  .navbar {
-    display: grid;
-    grid-template-columns: 1fr auto 1fr;
-    grid-template-areas:
-      "toggler brand actions"
-      "search search search";
-  }
-
+@media screen and (min-width: 376px) and (max-width: 768px) {
   .navbar-toggler {
-    grid-area: toggler;
-    text-align: left;
-  }
-
-  .navbar-brand {
-    grid-area: brand;
-    min-width: 0;
-    max-width: 100%;
-    justify-self: center;
-    overflow: hidden;
-
-    > div,
-    .custom-title {
-      min-width: 0;
-      max-width: 100%;
-      overflow: hidden;
-    }
-
-    .title,
-    .byline {
-      max-width: 100%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-
-  .search-container {
-    grid-area: search;
-    width: 100%;
-  }
-
-  .navbar > ul {
-    grid-area: actions;
-    justify-self: end;
-    flex-wrap: nowrap;
+    // compensate for 2 buttons on the right
+    margin-right: 45px;
   }
 }
 
@@ -355,6 +293,13 @@ main {
   }
 }
 
+@media screen and (max-width: 345px) {
+  .custom-title {
+    max-width: 110px;
+    overflow: hidden;
+  }
+}
+
 :host ::ng-deep .dropdown.show .dropdown-toggle,
 :host ::ng-deep .dropdown-toggle:hover {
   opacity: 0.7;

src-ui/src/app/components/chat/chat/chat.component.html

@@ -6,17 +6,17 @@
   <div ngbDropdownMenu class="dropdown-menu-end shadow p-3" aria-labelledby="chatDropdown">
     <div class="chat-container bg-light p-2">
       <div class="chat-messages font-monospace small">
-        @for (message of messages(); track message) {
+        @for (message of messages; track message) {
           <div class="message d-flex flex-row small" [class.justify-content-end]="message.role === 'user'">
             <div class="p-2 m-2" [class.bg-body]="message.role === 'user'">
-              <span class="text-break">
+              <span>
                 {{ message.content }}
                 @if (message.isStreaming) { <span class="blinking-cursor">|</span> }
               </span>
               @if (message.role === 'assistant' && message.references?.length) {
                 <div class="chat-references list-group mt-3">
                   @for (reference of message.references; track reference.id) {
-                    <a class="list-group-item list-group-item-action d-flex text-primary text-break" [routerLink]="['/documents', reference.id]">
+                    <a class="list-group-item list-group-item-action text-primary" [routerLink]="['/documents', reference.id]">
                       <i-bs width="0.9em" height="0.9em" name="file-text" class="me-1"></i-bs><span>{{ reference.title }}</span>
                     </a>
                   }
@@ -29,19 +29,16 @@
       </div>
 
       <form class="chat-input">
-        <label class="visually-hidden" for="chatInput" i18n>Message</label>
         <div class="input-group">
           <input
             #chatInput
-            id="chatInput"
             class="form-control form-control-sm" name="chatInput" type="text"
             [placeholder]="placeholder"
-            [disabled]="loading()"
-            [ngModel]="input()"
-            (ngModelChange)="input.set($event)"
+            [disabled]="loading"
+            [(ngModel)]="input"
             (keydown)="searchInputKeyDown($event)"
             />
-          <button class="btn btn-sm btn-secondary" type="button" (click)="sendMessage()" [disabled]="loading()">Send</button>
+          <button class="btn btn-sm btn-secondary" type="button" (click)="sendMessage()" [disabled]="loading">Send</button>
         </div>
       </form>
     </div>

src-ui/src/app/components/chat/chat/chat.component.scss

@@ -5,7 +5,6 @@
 .chat-messages {
   max-height: 350px;
   overflow-y: auto;
-  white-space: pre-wrap;
 }
 
 .chat-references {

src-ui/src/app/components/chat/chat/chat.component.spec.ts

@@ -56,53 +56,44 @@ describe('ChatComponent', () => {
   it('should update documentId on initialization', () => {
     jest.spyOn(router, 'url', 'get').mockReturnValue('/documents/123')
     component.ngOnInit()
-    expect(component.documentId()).toBe(123)
+    expect(component.documentId).toBe(123)
   })
 
   it('should update documentId on navigation', () => {
     component.ngOnInit()
     routerEvents$.next(new NavigationEnd(1, '/documents/456', '/documents/456'))
-    expect(component.documentId()).toBe(456)
+    expect(component.documentId).toBe(456)
   })
 
   it('should return correct placeholder based on documentId', () => {
-    component.documentId.set(123)
+    component.documentId = 123
     expect(component.placeholder).toBe('Ask a question about this document...')
-    component.documentId.set(undefined)
+    component.documentId = undefined
     expect(component.placeholder).toBe('Ask a question about a document...')
   })
 
-  it('should send a message and render the streaming response', async () => {
-    component.input.set('Hello')
+  it('should send a message and handle streaming response', () => {
+    component.input = 'Hello'
     component.sendMessage()
 
-    expect(component.messages()).toHaveLength(2)
-    expect(component.messages()[0].content).toBe('Hello')
-    expect(component.loading()).toBe(true)
+    expect(component.messages.length).toBe(2)
+    expect(component.messages[0].content).toBe('Hello')
+    expect(component.loading).toBe(true)
 
     mockStream$.next('Hi')
-    expect(component.messages()[1].content).toBe('H')
+    expect(component.messages[1].content).toBe('H')
     mockStream$.next('Hi there')
     // advance time to process the typewriter effect
-    await jest.runAllTimersAsync()
-    await fixture.whenStable()
-    expect(component.messages()[1].content).toBe('Hi there')
-    expect(
-      fixture.nativeElement.querySelector('.chat-messages').textContent
-    ).toContain('Hi there')
+    jest.advanceTimersByTime(1000)
+    expect(component.messages[1].content).toBe('Hi there')
 
     mockStream$.complete()
-    await jest.runAllTimersAsync()
-    await fixture.whenStable()
-    expect(component.loading()).toBe(false)
-    expect(component.messages()[1].isStreaming).toBe(false)
-    expect(fixture.nativeElement.querySelector('#chatInput').disabled).toBe(
-      false
-    )
+    expect(component.loading).toBe(false)
+    expect(component.messages[1].isStreaming).toBe(false)
   })
 
   it('should parse references from the metadata trailer without showing it', () => {
-    component.input.set('Hello')
+    component.input = 'Hello'
     component.sendMessage()
 
     mockStream$.next(
@@ -110,14 +101,14 @@ describe('ChatComponent', () => {
     )
     jest.advanceTimersByTime(1000)
 
-    expect(component.messages()[1].content).toBe('Hi there')
-    expect(component.messages()[1].references).toEqual([
+    expect(component.messages[1].content).toBe('Hi there')
+    expect(component.messages[1].references).toEqual([
       { id: 42, title: 'Bread Recipe' },
     ])
   })
 
   it('should render document reference links under assistant messages', () => {
-    component.input.set('Hello')
+    component.input = 'Hello'
     component.sendMessage()
 
     mockStream$.next(
@@ -132,12 +123,12 @@ describe('ChatComponent', () => {
   })
 
   it('should remove delimiter fragments that were already streamed', () => {
-    component.input.set('Hello')
+    component.input = 'Hello'
     component.sendMessage()
 
     mockStream$.next(`Hi there${CHAT_METADATA_DELIMITER.slice(0, 8)}`)
     jest.advanceTimersByTime(1000)
-    expect(component.messages()[1].content).toBe(
+    expect(component.messages[1].content).toBe(
       `Hi there${CHAT_METADATA_DELIMITER.slice(0, 8)}`
     )
 
@@ -146,28 +137,28 @@ describe('ChatComponent', () => {
     )
     jest.advanceTimersByTime(1000)
 
-    expect(component.messages()[1].content).toBe('Hi there')
-    expect(component.messages()[1].references).toEqual([
+    expect(component.messages[1].content).toBe('Hi there')
+    expect(component.messages[1].references).toEqual([
       { id: 42, title: 'Bread Recipe' },
     ])
   })
 
   it('should handle errors during streaming', () => {
-    component.input.set('Hello')
+    component.input = 'Hello'
     component.sendMessage()
 
     mockStream$.error('Error')
-    expect(component.messages()[1].content).toContain(
+    expect(component.messages[1].content).toContain(
       '⚠️ Error receiving response.'
     )
-    expect(component.loading()).toBe(false)
+    expect(component.loading).toBe(false)
   })
 
   it('should enqueue typewriter chunks correctly', () => {
     const message = { content: '', role: 'assistant', isStreaming: true }
     component.enqueueTypewriter(null, message as any) // coverage for null
     component.enqueueTypewriter('Hello', message as any)
-    expect(component['typewriterBuffer']).toHaveLength(4)
+    expect(component['typewriterBuffer'].length).toBe(4)
   })
 
   it('should scroll to bottom after sending a message', () => {
@@ -175,7 +166,7 @@ describe('ChatComponent', () => {
       ChatComponent.prototype as any,
       'scrollToBottom'
     )
-    component.input.set('Test')
+    component.input = 'Test'
     component.sendMessage()
     expect(scrollSpy).toHaveBeenCalled()
   })

src-ui/src/app/components/chat/chat/chat.component.ts

@@ -1,11 +1,4 @@
-import {
-  Component,
-  ElementRef,
-  inject,
-  OnInit,
-  signal,
-  ViewChild,
-} from '@angular/core'
+import { Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NavigationEnd, Router, RouterModule } from '@angular/router'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
@@ -30,10 +23,10 @@ import {
   styleUrl: './chat.component.scss',
 })
 export class ChatComponent implements OnInit {
-  readonly messages = signal<ChatMessage[]>([])
-  readonly loading = signal(false)
-  readonly input = signal('')
-  readonly documentId = signal<number>(undefined)
+  public messages: ChatMessage[] = []
+  public loading = false
+  public input: string = ''
+  public documentId!: number
 
   private chatService: ChatService = inject(ChatService)
   private router: Router = inject(Router)
@@ -45,7 +38,7 @@ export class ChatComponent implements OnInit {
   private typewriterActive = false
 
   public get placeholder(): string {
-    return this.documentId()
+    return this.documentId
       ? $localize`Ask a question about this document...`
       : $localize`Ask a question about a document...`
   }
@@ -64,14 +57,14 @@ export class ChatComponent implements OnInit {
 
   private updateDocumentId(url: string): void {
     const docIdRe = url.match(/^\/documents\/(\d+)/)
-    this.documentId.set(docIdRe ? +docIdRe[1] : undefined)
+    this.documentId = docIdRe ? +docIdRe[1] : undefined
   }
 
   sendMessage(): void {
-    if (!this.input().trim()) return
+    if (!this.input.trim()) return
 
-    const userMessage: ChatMessage = { role: 'user', content: this.input() }
-    this.messages.update((messages) => [...messages, userMessage])
+    const userMessage: ChatMessage = { role: 'user', content: this.input }
+    this.messages.push(userMessage)
     this.scrollToBottom()
 
     const assistantMessage: ChatMessage = {
@@ -79,12 +72,12 @@ export class ChatComponent implements OnInit {
       content: '',
       isStreaming: true,
     }
-    this.messages.update((messages) => [...messages, assistantMessage])
-    this.loading.set(true)
+    this.messages.push(assistantMessage)
+    this.loading = true
 
     let lastVisibleContent = ''
 
-    this.chatService.streamChat(this.documentId(), this.input()).subscribe({
+    this.chatService.streamChat(this.documentId, this.input).subscribe({
       next: (chunk) => {
         const nextResponse = parseChatResponse(chunk)
 
@@ -100,30 +93,26 @@ export class ChatComponent implements OnInit {
         }
 
         assistantMessage.references = nextResponse.references
-        this.notifyMessagesChanged()
       },
       error: () => {
         assistantMessage.content += '\n\n⚠️ Error receiving response.'
         assistantMessage.isStreaming = false
-        this.notifyMessagesChanged()
-        this.loading.set(false)
+        this.loading = false
       },
       complete: () => {
         assistantMessage.isStreaming = false
-        this.notifyMessagesChanged()
-        this.loading.set(false)
+        this.loading = false
         this.scrollToBottom()
       },
     })
 
-    this.input.set('')
+    this.input = ''
   }
 
   private resetTypewriter(message: ChatMessage, content: string): void {
     this.typewriterBuffer = []
     this.typewriterActive = false
     message.content = content
-    this.notifyMessagesChanged()
     this.scrollToBottom()
   }
 
@@ -146,16 +135,11 @@ export class ChatComponent implements OnInit {
 
     const nextChar = this.typewriterBuffer.shift()
     message.content += nextChar
-    this.notifyMessagesChanged()
     this.scrollToBottom()
 
     setTimeout(() => this.playTypewriter(message), 10) // 10ms per character
   }
 
-  private notifyMessagesChanged(): void {
-    this.messages.update((messages) => [...messages])
-  }
-
   private scrollToBottom(): void {
     setTimeout(() => {
       this.scrollAnchor?.nativeElement?.scrollIntoView({ behavior: 'smooth' })

src-ui/src/app/components/common/confirm-button/confirm-button.component.html

@@ -17,6 +17,6 @@
 
 <ng-template #popoverContent>
     <div>
-        {{confirmMessage}}&nbsp;<button class="btn btn-link btn-sm text-danger p-0 m-0 lh-1" type="button" (click)="onConfirm($event)" i18n>Yes</button>
+        {{confirmMessage}}&nbsp;<button class="btn btn-link btn-sm text-danger p-0 m-0 lh-1" type="button" (click)="onConfirm($event)">Yes</button>
     </div>
 </ng-template>

src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html

@@ -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>
   }

src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts

@@ -64,22 +64,6 @@ 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')

src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts

@@ -1,12 +1,5 @@
 import { DecimalPipe } from '@angular/common'
-import {
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-  inject,
-  signal,
-} from '@angular/core'
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { Subject } from 'rxjs'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
@@ -53,7 +46,8 @@ export class ConfirmDialogComponent extends LoadingComponentWithPermissions {
   @Input()
   cancelBtnCaption = $localize`Cancel`
 
-  readonly buttonsEnabled = signal(true)
+  @Input()
+  buttonsEnabled = true
 
   confirmButtonEnabled = true
   alternativeButtonEnabled = true

src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.html

@@ -1,58 +0,0 @@
-<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>

src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.scss

@@ -1,3 +0,0 @@
-.list-group-item {
-    cursor: move;
-}

src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.spec.ts

@@ -1,70 +0,0 @@
-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])
-  })
-})

src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.ts

@@ -1,70 +0,0 @@
-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)
-  }
-}

src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html

@@ -36,7 +36,7 @@
         </div>
     <div class="form-group mt-4">
         <label class="form-label" for="metadataDocumentID" i18n>Use metadata from:</label>
-        <select id="metadataDocumentID" class="form-select" [ngModel]="metadataDocumentID()" (ngModelChange)="metadataDocumentID.set($event)">
+        <select 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>

src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.html

@@ -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>

src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.html

@@ -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>

src-ui/src/app/components/common/custom-field-display/custom-field-display.component.ts

@@ -1,12 +1,5 @@
 import { CurrencyPipe, getLocaleCurrencyCode, SlicePipe } from '@angular/common'
-import {
-  ChangeDetectorRef,
-  Component,
-  inject,
-  Input,
-  LOCALE_ID,
-  OnInit,
-} from '@angular/core'
+import { Component, inject, Input, LOCALE_ID, OnInit } from '@angular/core'
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
 import { takeUntil } from 'rxjs'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
@@ -29,7 +22,6 @@ export class CustomFieldDisplayComponent
 {
   private customFieldService = inject(CustomFieldsService)
   private documentService = inject(DocumentService)
-  private changeDetector = inject(ChangeDetectorRef)
 
   CustomFieldDataType = CustomFieldDataType
 
@@ -82,7 +74,6 @@ export class CustomFieldDisplayComponent
     this.customFieldService.listAll().subscribe((r) => {
       this.customFields = r.results
       this.init()
-      this.changeDetector.markForCheck()
     })
   }
 
@@ -120,7 +111,6 @@ export class CustomFieldDisplayComponent
         this.docLinkDocuments = this.value
           .map((id) => result.results.find((d) => d.id === id))
           .filter((d) => d)
-        this.changeDetector.markForCheck()
       })
   }
 

src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts

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

src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts

@@ -8,7 +8,6 @@ import {
   ViewChild,
   ViewChildren,
   inject,
-  signal,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -66,11 +65,11 @@ export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissio
   @ViewChildren('button') buttons: QueryList<ElementRef>
 
   private customFields: CustomField[] = []
-  private readonly unusedFields = signal<CustomField[]>([])
+  private unusedFields: CustomField[] = []
   private keyboardIndex: number
 
   public get filteredFields(): CustomField[] {
-    return this.unusedFields().filter(
+    return this.unusedFields.filter(
       (f) => !this.filterText || matchesSearchText(f.name, this.filterText)
     )
   }
@@ -100,10 +99,8 @@ export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissio
   }
 
   private updateUnusedFields() {
-    this.unusedFields.set(
-      this.customFields.filter(
-        (f) => !this.existingFields?.find((e) => e.field === f.id)
-      )
+    this.unusedFields = this.customFields.filter(
+      (f) => !this.existingFields?.find((e) => e.field === f.id)
     )
   }
 

src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html

@@ -68,11 +68,6 @@
     ></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">
   }
@@ -82,7 +77,7 @@
   <div class="input-group input-group-sm">
     <ng-select #fieldSelects
       class="paperless-input-select"
-      [items]="customFields()"
+      [items]="customFields"
       [(ngModel)]="atom.field"
       [disabled]="disabled"
       bindLabel="name"

src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts

@@ -1,6 +1,5 @@
 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'
@@ -42,12 +41,6 @@ const customFields = [
       ],
     },
   },
-  {
-    id: 3,
-    name: 'Test Monetary Field',
-    data_type: CustomFieldDataType.Monetary,
-    extra_data: { default_currency: 'EUR' },
-  },
 ]
 
 describe('CustomFieldsQueryDropdownComponent', () => {
@@ -68,7 +61,6 @@ describe('CustomFieldsQueryDropdownComponent', () => {
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
-        { provide: LOCALE_ID, useValue: 'de' },
       ],
     }).compileComponents()
 
@@ -87,7 +79,7 @@ describe('CustomFieldsQueryDropdownComponent', () => {
   })
 
   it('should initialize custom fields on creation', () => {
-    expect(component.customFields()).toEqual(customFields)
+    expect(component.customFields).toEqual(customFields)
   })
 
   it('should add an expression when opened if queries are empty', () => {
@@ -109,7 +101,7 @@ describe('CustomFieldsQueryDropdownComponent', () => {
       data_type: CustomFieldDataType.String,
       extra_data: {},
     }
-    component.customFields.set([field])
+    component.customFields = [field]
     const operators = component.getOperatorsForField(1)
     expect(operators.length).toEqual(
       [
@@ -146,7 +138,7 @@ describe('CustomFieldsQueryDropdownComponent', () => {
         ],
       },
     }
-    component.customFields.set([field])
+    component.customFields = [field]
     const options = component.getSelectOptionsForField(1)
     expect(options).toEqual([
       { label: 'Option 1', id: 'abc-123' },
@@ -158,22 +150,6 @@ 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()

src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts

@@ -1,17 +1,11 @@
-import {
-  getLocaleNumberSymbol,
-  NgTemplateOutlet,
-  NumberSymbol,
-} from '@angular/common'
+import { NgTemplateOutlet } from '@angular/common'
 import {
   Component,
   EventEmitter,
   inject,
   Input,
-  LOCALE_ID,
   Output,
   QueryList,
-  signal,
   ViewChild,
   ViewChildren,
 } from '@angular/core'
@@ -217,7 +211,6 @@ export class CustomFieldQueriesModel {
 })
 export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPermissions {
   protected customFieldsService = inject(CustomFieldsService)
-  private readonly locale = inject(LOCALE_ID)
 
   public CustomFieldQueryComponentType = CustomFieldQueryElementType
   public CustomFieldQueryOperator = CustomFieldQueryOperator
@@ -285,7 +278,7 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
   @Output()
   selectionModelChange = new EventEmitter<CustomFieldQueriesModel>()
 
-  readonly customFields = signal<CustomField[]>([])
+  customFields: CustomField[] = []
 
   public readonly today: string = new Date().toLocaleDateString('en-CA')
 
@@ -332,12 +325,12 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
       .listAll()
       .pipe(first(), takeUntil(this.unsubscribeNotifier))
       .subscribe((result) => {
-        this.customFields.set(result.results)
+        this.customFields = result.results
       })
   }
 
   public getCustomFieldByID(id: number): CustomField {
-    return this.customFields().find((field) => field.id === id)
+    return this.customFields.find((field) => field.id === id)
   }
 
   public addAtom(expression: CustomFieldQueryExpression) {
@@ -360,7 +353,7 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
   getOperatorsForField(
     fieldID: number
   ): Array<{ value: string; label: string }> {
-    const field = this.customFields().find((field) => field.id === fieldID)
+    const field = this.customFields.find((field) => field.id === fieldID)
     const groups: CustomFieldQueryOperatorGroups[] = field
       ? CUSTOM_FIELD_QUERY_OPERATOR_GROUPS_BY_TYPE[field.data_type]
       : [CustomFieldQueryOperatorGroups.Basic]
@@ -376,24 +369,10 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
   getSelectOptionsForField(
     fieldID: number
   ): Array<{ label: string; id: string }> {
-    const field = this.customFields().find((field) => field.id === fieldID)
+    const field = this.customFields.find((field) => field.id === fieldID)
     if (field) {
       return field.extra_data['select_options']
     }
     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
-  }
 }

src-ui/src/app/components/common/edit-dialog/edit-dialog.component.spec.ts

@@ -32,8 +32,6 @@ 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],
@@ -278,22 +276,4 @@ 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.'
-    )
-  })
 })

src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts

@@ -1,5 +1,4 @@
 import {
-  ChangeDetectorRef,
   Directive,
   EventEmitter,
   Input,
@@ -46,7 +45,6 @@ export abstract class EditDialogComponent<
   protected userService = inject(UserService)
   protected settingsService = inject(SettingsService)
   protected permissionsService = inject(PermissionsService)
-  protected changeDetector = inject(ChangeDetectorRef)
 
   dialogMode = model(EditDialogMode.CREATE)
 
@@ -110,12 +108,10 @@ 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()
     })
   }
 
@@ -195,7 +191,6 @@ export abstract class EditDialogComponent<
         this.error = error.error
         this.networkActive = false
         this.failed.next(error)
-        this.changeDetector.markForCheck()
       },
     })
   }

src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html

@@ -22,11 +22,11 @@
             <ng-template>
               <div class="card mb-2">
                 <div class="card-body p-2">
-                  @if (testLoading()) {
+                  @if (testLoading) {
                     <ng-container [ngTemplateOutlet]="loadingTemplate"></ng-container>
-                  } @else if (testResult()) {
-                    <code>{{testResult()}}</code>
-                  } @else if (testFailed()) {
+                  } @else if (testResult) {
+                    <code>{{testResult}}</code>
+                  } @else if (testFailed) {
                     <div class="text-danger" i18n>Path test failed</div>
                   } @else {
                     <div class="text-muted small" i18n>No document selected</div>
@@ -42,7 +42,7 @@
                 [compareWith]="compareDocuments"
                 [trackByFn]="trackByFn"
                 [minTermLength]="2"
-                [loading]="loading()"
+                [loading]="loading"
                 [typeahead]="documentsInput$"
                 (change)="testPath($event)">
                 <ng-template #loadingTemplate ng-loadingspinner-tmp>

src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.spec.ts

@@ -58,17 +58,17 @@ describe('StoragePathEditDialogComponent', () => {
     fixture.detectChanges()
     component.testPath({ id: 1 })
     expect(testSpy).toHaveBeenCalledWith('test/{{title}}', 1)
-    expect(component.testResult()).toBe('test/abc123')
-    expect(component.testFailed()).toBeFalsy()
+    expect(component.testResult).toBe('test/abc123')
+    expect(component.testFailed).toBeFalsy()
 
     // test failed
     testSpy.mockReturnValueOnce(of(''))
     component.testPath({ id: 1 })
-    expect(component.testResult()).toBeNull()
-    expect(component.testFailed()).toBeTruthy()
+    expect(component.testResult).toBeNull()
+    expect(component.testFailed).toBeTruthy()
 
     component.testPath(null)
-    expect(component.testResult()).toBeNull()
+    expect(component.testResult).toBeNull()
   })
 
   it('should compare two documents by id', () => {

src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts

@@ -1,5 +1,5 @@
 import { AsyncPipe, NgTemplateOutlet } from '@angular/common'
-import { Component, OnDestroy, inject, signal } from '@angular/core'
+import { Component, OnDestroy, inject } from '@angular/core'
 import {
   FormControl,
   FormGroup,
@@ -65,9 +65,9 @@ export class StoragePathEditDialogComponent
   public documentsInput$ = new Subject<string>()
   public foundDocuments$: Observable<Document[]>
   private testDocument: Document
-  readonly testResult = signal<string>(undefined)
-  readonly testFailed = signal(false)
-  readonly testLoading = signal(false)
+  public testResult: string
+  public testFailed: boolean = false
+  public testLoading = false
 
   constructor() {
     super()
@@ -99,22 +99,22 @@ export class StoragePathEditDialogComponent
 
   public testPath(document: Document) {
     if (!document) {
-      this.testResult.set(null)
+      this.testResult = null
       return
     }
     this.testDocument = document
-    this.testLoading.set(true)
+    this.testLoading = true
     ;(this.service as StoragePathService)
       .testPath(this.objectForm.get('path').value, document.id)
       .subscribe((result) => {
         if (result?.length) {
-          this.testResult.set(result)
-          this.testFailed.set(false)
+          this.testResult = result
+          this.testFailed = false
         } else {
-          this.testResult.set(null)
-          this.testFailed.set(true)
+          this.testResult = null
+          this.testFailed = true
         }
-        this.testLoading.set(false)
+        this.testLoading = false
       })
   }
 

src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html

@@ -12,7 +12,7 @@
 
     <pngx-input-color i18n-title title="Color" formControlName="color" [error]="error?.color"></pngx-input-color>
 
-    <pngx-input-select i18n-title title="Parent" formControlName="parent" [items]="tags()" [allowNull]="true" [error]="error?.parent"></pngx-input-select>
+    <pngx-input-select i18n-title title="Parent" formControlName="parent" [items]="tags" [allowNull]="true" [error]="error?.parent"></pngx-input-select>
 
     <pngx-input-check i18n-title title="Inbox tag" formControlName="is_inbox_tag" i18n-hint hint="Inbox tags are automatically assigned to all consumed documents."></pngx-input-check>
     <pngx-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>

src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.ts

@@ -1,4 +1,4 @@
-import { Component, inject, signal } from '@angular/core'
+import { Component, inject } from '@angular/core'
 import {
   FormControl,
   FormGroup,
@@ -35,7 +35,7 @@ import { TextComponent } from '../../input/text/text.component'
   ],
 })
 export class TagEditDialogComponent extends EditDialogComponent<Tag> {
-  readonly tags = signal<Tag[]>([])
+  tags: Tag[]
 
   constructor() {
     super()
@@ -43,7 +43,7 @@ export class TagEditDialogComponent extends EditDialogComponent<Tag> {
     this.userService = inject(UserService)
     this.settingsService = inject(SettingsService)
     this.service.listAll().subscribe((result) => {
-      this.tags.set(result.results)
+      this.tags = result.results
     })
   }
 

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html

@@ -180,7 +180,7 @@
         <div class="col">
           <div class="trigger-filters mb-3">
             <div class="d-flex align-items-center">
-              <span class="form-label mb-0" i18n>Advanced Filters</span>
+              <label class="form-label mb-0" i18n>Advanced Filters</label>
               <button
                 type="button"
                 class="btn btn-sm btn-outline-primary ms-auto"

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.spec.ts

@@ -401,7 +401,7 @@ describe('WorkflowEditDialogComponent', () => {
     component.addFilter(triggerGroup as FormGroup)
 
     const filters = component.getFiltersFormArray(triggerGroup as FormGroup)
-    expect(filters).toHaveLength(3)
+    expect(filters.length).toBe(3)
 
     filters.at(0).get('values').setValue([1])
     filters.at(1).get('values').setValue([2, 3])
@@ -672,7 +672,7 @@ describe('WorkflowEditDialogComponent', () => {
     } as any
 
     const filters = component['buildFiltersFormArray'](trigger)
-    expect(filters).toHaveLength(0)
+    expect(filters.length).toBe(0)
 
     component.filterDefinitions = originalDefinitions
   })
@@ -739,7 +739,7 @@ describe('WorkflowEditDialogComponent', () => {
     component.ngOnInit()
     const triggerGroup = component.triggerFields.at(0) as FormGroup
     const filters = component.getFiltersFormArray(triggerGroup)
-    expect(filters).toHaveLength(13)
+    expect(filters.length).toBe(13)
     const customFieldFilter = filters.at(12) as FormGroup
     expect(customFieldFilter.get('type').value).toBe(
       TriggerFilterType.CustomFieldQuery
@@ -969,12 +969,12 @@ describe('WorkflowEditDialogComponent', () => {
     component.addFilter(triggerGroup)
 
     component.removeFilter(triggerGroup, 0)
-    expect(component.getFiltersFormArray(triggerGroup)).toHaveLength(0)
+    expect(component.getFiltersFormArray(triggerGroup).length).toBe(0)
 
     component.addFilter(triggerGroup)
     const filterArrayAfterAdd = component.getFiltersFormArray(triggerGroup)
     filterArrayAfterAdd.at(0).get('type').setValue(TriggerFilterType.TagsAll)
-    expect(component.getFiltersFormArray(triggerGroup)).toHaveLength(1)
+    expect(component.getFiltersFormArray(triggerGroup).length).toBe(1)
   })
 
   it('should remove selected custom field from the form group', () => {
@@ -1019,28 +1019,4 @@ 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([])
-  })
 })

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts

@@ -933,7 +933,7 @@ export class WorkflowEditDialogComponent
 
   getFilterSelectItems(type: TriggerFilterType) {
     const definition = this.getFilterDefinition(type)
-    if (definition?.inputType !== 'select') {
+    if (!definition || definition.inputType !== 'select') {
       return []
     }
 
@@ -1207,8 +1207,9 @@ export class WorkflowEditDialogComponent
     return passwords.join('\n')
   }
 
-  private parsePasswords(value: string | string[] = ''): string[] {
-    return (Array.isArray(value) ? value : value.split(/[\n,]+/))
+  private parsePasswords(value: string = ''): string[] {
+    return value
+      .split(/[\n,]+/)
       .map((entry) => entry.trim())
       .filter((entry) => entry.length > 0)
   }

src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html

@@ -1,4 +1,4 @@
-<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown" (keydown)="listKeyDown($event)" [popperOptions]="popperOptions" [autoClose]="!creating()">
+<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown" (keydown)="listKeyDown($event)" [popperOptions]="popperOptions">
   <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) {
@@ -34,35 +34,37 @@
       </div>
       @if (selectionModel.items) {
         <cdk-virtual-scroll-viewport class="items" [itemSize]="FILTERABLE_BUTTON_HEIGHT_PX" #buttonsViewport [style.height.px]="scrollViewportHeight">
-          <div *cdkVirtualFor="let item of filteredItems; trackBy: trackByItem; let i = index">
-            <pngx-toggleable-dropdown-button
-              [item]="item"
-              [hideCount]="hideCount(item)"
-              [opacifyCount]="!editing"
-              [state]="selectionModel.get(item.id)"
-              [count]="getUpdatedDocumentCount(item.id)"
-              (toggled)="selectionModel.toggle(item.id)"
-              (exclude)="excludeClicked(item.id)"
-              [disabled]="disabled">
-            </pngx-toggleable-dropdown-button>
+          <div *cdkVirtualFor="let item of selectionModel.items | filter: filterText:'name'; trackBy: trackByItem; let i = index">
+            @if (allowSelectNone || item.id) {
+              <pngx-toggleable-dropdown-button
+                [item]="item"
+                [hideCount]="hideCount(item)"
+                [opacifyCount]="!editing"
+                [state]="selectionModel.get(item.id)"
+                [count]="getUpdatedDocumentCount(item.id)"
+                (toggled)="selectionModel.toggle(item.id)"
+                (exclude)="excludeClicked(item.id)"
+                [disabled]="disabled">
+              </pngx-toggleable-dropdown-button>
+            }
           </div>
         </cdk-virtual-scroll-viewport>
       }
       @if (editing) {
-        @if (filteredItems.length === 0 && createRef !== undefined && filterText?.length > 0) {
+        @if ((selectionModel.items | filter: filterText:'name').length === 0 && createRef !== undefined) {
           <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>
           </button>
         }
-        @if (filteredItems.length > 0) {
-          <button class="list-group-item list-group-item-action bg-light d-flex align-items-center" (click)="applyClicked()" [disabled]="!modelIsDirty() || disabled">
-            <small class="ms-2" [ngClass]="{'fw-bold': modelIsDirty()}" i18n>Apply</small>
+        @if ((selectionModel.items | filter: filterText:'name').length > 0) {
+          <button class="list-group-item list-group-item-action bg-light d-flex align-items-center" (click)="applyClicked()" [disabled]="!modelIsDirty || disabled">
+            <small class="ms-2" [ngClass]="{'fw-bold': modelIsDirty}" i18n>Apply</small>
             <i-bs width="1.5em" height="1em" name="arrow-right"></i-bs>
           </button>
         }
       }
-      @if (extraButtonTitle && (showExtraButtonIfEmpty || filteredItems?.length > 0)) {
+      @if (extraButtonTitle) {
         <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>

src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts

@@ -3,7 +3,6 @@ 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,
@@ -49,7 +48,6 @@ 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
@@ -223,7 +221,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
       .dispatchEvent(new MouseEvent('click')) // open
     selectionModel.toggle(items[0].id)
     fixture.detectChanges()
-    expect(component.modelIsDirty()).toBeTruthy()
+    expect(component.modelIsDirty).toBeTruthy()
     let applyResult: ChangedItems
     const closeSpy = jest.spyOn(component.dropdown, 'close')
     component.apply.subscribe((result) => (applyResult = result))
@@ -246,7 +244,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
       .dispatchEvent(new MouseEvent('click')) // open
     selectionModel.toggle(items[0].id)
     fixture.detectChanges()
-    expect(component.modelIsDirty()).toBeTruthy()
+    expect(component.modelIsDirty).toBeTruthy()
     let applyResult: ChangedItems
     component.apply.subscribe((result) => (applyResult = result))
     component.dropdown.close()
@@ -267,9 +265,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
     expect(document.activeElement).toEqual(
       component.listFilterTextInput.nativeElement
     )
-    expect(component.buttonsViewport.getRenderedRange().end).toEqual(
-      items.length
-    ) // all selectable items shown
+    expect(component.buttonsViewport.getRenderedRange().end).toEqual(3) // all items shown
 
     component.filterText = 'Tag2'
     fixture.detectChanges()
@@ -282,29 +278,6 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
     expect(component.filterText).toHaveLength(0)
   })
 
-  it('should omit disallowed null items from the virtual scroll viewport', async () => {
-    component.selectionModel.items = items
-    component.icon = 'tag-fill'
-    fixture.nativeElement
-      .querySelector('button')
-      .dispatchEvent(new MouseEvent('click')) // open
-    fixture.detectChanges()
-    await wait(100)
-    fixture.detectChanges()
-    component.buttonsViewport?.checkViewportSize()
-    fixture.detectChanges()
-
-    expect(component.filteredItems).toEqual(items)
-    expect(component.scrollViewportHeight).toEqual(
-      items.length * component.FILTERABLE_BUTTON_HEIGHT_PX
-    )
-    expect(
-      component.buttonsViewport.elementRef.nativeElement.querySelectorAll(
-        '.cdk-virtual-scroll-content-wrapper > div'
-      )
-    ).toHaveLength(items.length)
-  })
-
   it('should toggle & close on enter inside filter field if 1 item remains', async () => {
     component.selectionModel.items = items
     component.icon = 'tag-fill'
@@ -870,7 +843,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
     expect(getRootDocCount(rootWithoutCounts.id)).toEqual(0)
   })
 
-  it('should keep the dropdown open while the create modal is active', async () => {
+  it('should set support create, keep open model and call createRef method', async () => {
     component.selectionModel.items = items
     component.icon = 'tag-fill'
     component.selectionModel = selectionModel
@@ -884,44 +857,20 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
     fixture.detectChanges()
 
     component.filterText = 'Test Filter Text'
-    const modalClosed = new Subject<void>()
-    component.createRef = jest.fn(
-      () =>
-        ({
-          closed: modalClosed,
-          dismissed: NEVER,
-        }) as any
-    )
+    component.createRef = jest.fn()
     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(createModalRef)
+    component.createRef = jest.fn()
     const createSpy = jest.spyOn(component, 'createClicked')
     expect(component.selectionModel.getSelectedItems()).toEqual([])
     fixture.nativeElement
@@ -937,25 +886,6 @@ 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
@@ -1015,18 +945,4 @@ 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')
-  })
 })

src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts

@@ -12,16 +12,11 @@ import {
   Output,
   ViewChild,
   inject,
-  signal,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import {
-  NgbDropdown,
-  NgbDropdownModule,
-  NgbModalRef,
-} from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { Subject, filter, first, merge, takeUntil } from 'rxjs'
+import { Subject, filter, takeUntil } from 'rxjs'
 import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
 import { MatchingModel } from 'src/app/data/matching-model'
 import { ObjectWithPermissions } from 'src/app/data/object-with-permissions'
@@ -665,6 +660,7 @@ export class FilterableDropdownSelectionModel {
   imports: [
     ClearableBadgeComponent,
     ToggleableDropdownButtonComponent,
+    FilterPipe,
     FormsModule,
     ReactiveFormsModule,
     NgxBootstrapIconsModule,
@@ -763,7 +759,7 @@ export class FilterableDropdownComponent
   disabled = false
 
   @Input()
-  createRef: (name: string) => NgbModalRef
+  createRef: (name) => void
 
   @Input()
   set documentCounts(counts: SelectionDataItem[]) {
@@ -778,10 +774,7 @@ export class FilterableDropdownComponent
   @Input()
   extraButtonTitle: string
 
-  @Input()
-  showExtraButtonIfEmpty: boolean = false
-
-  readonly creating = signal(false)
+  creating: boolean = false
 
   @Output()
   apply = new EventEmitter<ChangedItems>()
@@ -803,27 +796,22 @@ export class FilterableDropdownComponent
     return this.title ? this.title.replace(/\s/g, '_').toLowerCase() : null
   }
 
-  readonly modelIsDirty = signal(false)
+  modelIsDirty: boolean = false
 
   private keyboardIndex: number
 
-  public get filteredItems(): MatchingModel[] {
-    return this.filterPipe
-      .transform(this.items, this.filterText, 'name')
-      .filter((item) => this.allowSelectNone || Boolean(item.id))
-  }
-
   public get scrollViewportHeight(): number {
-    return Math.min(
-      this.filteredItems.length * this.FILTERABLE_BUTTON_HEIGHT_PX,
-      400
-    )
+    const filteredLength = this.filterPipe.transform(
+      this.items,
+      this.filterText
+    ).length
+    return Math.min(filteredLength * this.FILTERABLE_BUTTON_HEIGHT_PX, 400)
   }
 
   constructor() {
     super()
     this.selectionModelChange.subscribe((updatedModel) => {
-      this.modelIsDirty.set(updatedModel.isDirty())
+      this.modelIsDirty = updatedModel.isDirty()
     })
   }
 
@@ -858,32 +846,27 @@ export class FilterableDropdownComponent
   }
 
   createClicked() {
-    this.creating.set(true)
-    const modal = this.createRef(this.filterText)
-    merge(modal.closed, modal.dismissed)
-      .pipe(first(), takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => this.creating.set(false))
+    this.creating = true
+    this.createRef(this.filterText)
   }
 
   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()
       }, 0)
       if (this.editing) {
         this.selectionModel.reset()
-        this.modelIsDirty.set(false)
+        this.modelIsDirty = false
       }
       this.selectionModel.singleSelect =
         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()) {
@@ -894,7 +877,7 @@ export class FilterableDropdownComponent
   }
 
   listFilterEnter(): void {
-    const filtered = this.filteredItems
+    let filtered = this.filterPipe.transform(this.items, this.filterText)
     if (filtered.length == 1) {
       this.selectionModel.toggle(filtered[0].id)
       setTimeout(() => {
@@ -904,11 +887,7 @@ export class FilterableDropdownComponent
           this.dropdown.close()
         }
       }, 200)
-    } else if (
-      filtered.length == 0 &&
-      this.createRef &&
-      this.filterText?.length > 0
-    ) {
+    } else if (filtered.length == 0 && this.createRef) {
       this.createClicked()
     }
   }

src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.spec.ts

@@ -52,10 +52,10 @@ describe('CustomFieldsValuesComponent', () => {
   })
 
   it('should set selectedFields and map values correctly', () => {
-    component.value = { 1: 'value1', 3: 0, 4: false }
-    component.selectedFields = [1, 2, 3, 4]
-    expect(component.selectedFields).toEqual([1, 2, 3, 4])
-    expect(component.value).toEqual({ 1: 'value1', 2: null, 3: 0, 4: false })
+    component.value = { 1: 'value1' }
+    component.selectedFields = [1, 2]
+    expect(component.selectedFields).toEqual([1, 2])
+    expect(component.value).toEqual({ 1: 'value1', 2: null })
   })
 
   it('should return the correct custom field by id', () => {

src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.ts

@@ -5,7 +5,6 @@ import {
   inject,
   Input,
   Output,
-  signal,
 } from '@angular/core'
 import {
   FormsModule,
@@ -64,11 +63,11 @@ export class CustomFieldsValuesComponent extends AbstractInputComponent<Object>
 
     super()
     customFieldsService.listAll().subscribe((items) => {
-      this.fields.set(items.results)
+      this.fields = items.results
     })
   }
 
-  private readonly fields = signal<CustomField[]>([])
+  private fields: CustomField[]
 
   private _selectedFields: number[]
 
@@ -77,7 +76,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)
@@ -91,6 +90,6 @@ export class CustomFieldsValuesComponent extends AbstractInputComponent<Object>
   public removeSelectedField: EventEmitter<number> = new EventEmitter<number>()
 
   public getCustomField(id: number): CustomField {
-    return this.fields().find((field) => field.id === id)
+    return this.fields.find((field) => field.id === id)
   }
 }

src-ui/src/app/components/common/input/document-link/document-link.component.html

@@ -33,7 +33,7 @@
     [compareWith]="compareDocuments"
     [trackByFn]="trackByFn"
     [minTermLength]="2"
-    [loading]="loading()"
+    [loading]="loading"
     [typeahead]="documentsInput$"
     (mousedown)="$event.stopImmediatePropagation()"
     (change)="onChange(selectedDocumentIDs)">

src-ui/src/app/components/common/input/document-link/document-link.component.spec.ts

@@ -2,11 +2,7 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NG_VALUE_ACCESSOR } from '@angular/forms'
-import { By } from '@angular/platform-browser'
-import { provideRouter } from '@angular/router'
-import { NgSelectComponent } from '@ng-select/ng-select'
-import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { of, Subject, throwError } from 'rxjs'
+import { of, throwError } from 'rxjs'
 import { FILTER_SIMPLE_TITLE } from 'src/app/data/filter-rule-type'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { DocumentLinkComponent } from './document-link.component'
@@ -37,11 +33,10 @@ describe('DocumentLinkComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [DocumentLinkComponent, NgxBootstrapIconsModule.pick(allIcons)],
+      imports: [DocumentLinkComponent],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
-        provideRouter([]),
       ],
     })
     documentService = TestBed.inject(DocumentService)
@@ -65,25 +60,6 @@ describe('DocumentLinkComponent', () => {
     expect(getSpy).toHaveBeenCalled()
   })
 
-  it('should render loading and selected documents after async updates', async () => {
-    const result$ = new Subject<any>()
-    jest.spyOn(documentService, 'getFew').mockReturnValue(result$)
-
-    component.writeValue([1])
-    await fixture.whenStable()
-
-    const select = fixture.debugElement.query(By.directive(NgSelectComponent))
-      .componentInstance as NgSelectComponent
-    expect(select.loading()).toBe(true)
-
-    result$.next({ count: 1, all: [1], results: [documents[0]] })
-    result$.complete()
-    await fixture.whenStable()
-
-    expect(select.loading()).toBe(false)
-    expect(fixture.nativeElement.textContent).toContain(documents[0].title)
-  })
-
   it('shoud maintain ordering of selected documents', () => {
     const getSpy = jest.spyOn(documentService, 'getFew')
     getSpy.mockImplementation((ids) => {

src-ui/src/app/components/common/input/document-link/document-link.component.ts

@@ -6,7 +6,6 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  signal,
 } from '@angular/core'
 import {
   FormsModule,
@@ -64,7 +63,7 @@ export class DocumentLinkComponent
 
   documentsInput$ = new Subject<string>()
   foundDocuments$: Observable<Document[]>
-  readonly loading = signal(false)
+  loading = false
   selectedDocuments: Document[] = []
 
   private unsubscribeNotifier: Subject<any> = new Subject()
@@ -94,12 +93,12 @@ export class DocumentLinkComponent
       this.selectedDocuments = []
       super.writeValue([])
     } else {
-      this.loading.set(true)
+      this.loading = true
       this.documentsService
         .getFew(documentIDs, { fields: 'id,title' })
         .pipe(takeUntil(this.unsubscribeNotifier))
         .subscribe((documentResults) => {
-          this.loading.set(false)
+          this.loading = false
           this.selectedDocuments = documentIDs.map(
             (id) => documentResults.results.find((d) => d.id === id) ?? {}
           )
@@ -114,7 +113,7 @@ export class DocumentLinkComponent
       this.documentsInput$.pipe(
         distinctUntilChanged(),
         takeUntil(this.unsubscribeNotifier),
-        tap(() => this.loading.set(true)),
+        tap(() => (this.loading = true)),
         switchMap((title) =>
           this.documentsService
             .listFiltered(
@@ -134,7 +133,7 @@ export class DocumentLinkComponent
                 )
               ),
               catchError(() => of([])), // empty on error
-              tap(() => this.loading.set(false))
+              tap(() => (this.loading = false))
             )
         )
       )

src-ui/src/app/components/common/input/number/number.component.ts

@@ -37,7 +37,6 @@ export class NumberComponent extends AbstractInputComponent<number> {
     this.documentService.getNextAsn().subscribe((nextAsn) => {
       this.value = nextAsn
       this.onChange(this.value)
-      this.changeDetector.markForCheck()
     })
   }
 

src-ui/src/app/components/common/input/select/select.component.html

@@ -36,16 +36,7 @@
           (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>

src-ui/src/app/components/common/input/select/select.component.ts

@@ -35,7 +35,7 @@ import { AbstractInputComponent } from '../abstract-input'
     NgxBootstrapIconsModule,
   ],
 })
-export class SelectComponent extends AbstractInputComponent<number | string> {
+export class SelectComponent extends AbstractInputComponent<number> {
   constructor() {
     super()
     this.addItemRef = this.addItem.bind(this)
@@ -100,9 +100,6 @@ export class SelectComponent extends AbstractInputComponent<number | string> {
   @Input()
   bindLabel: string = 'name'
 
-  @Input()
-  iconField: string
-
   public searchFn = (term: string, item: any): boolean =>
     matchesSearchText(item?.[this.bindLabel], term)
 

src-ui/src/app/components/common/input/tags/tags.component.ts

@@ -157,8 +157,8 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
 
   private removeChildren(tagIDs: number[], tag: Tag) {
     if (tag.children?.length) {
-      const childIDs = new Set(tag.children.map((child) => child.id))
-      tagIDs = tagIDs.filter((id) => !childIDs.has(id))
+      const childIDs = tag.children.map((child) => child.id)
+      tagIDs = tagIDs.filter((id) => !childIDs.includes(id))
       for (const child of tag.children) {
         tagIDs = this.removeChildren(tagIDs, child)
       }