Fix tests

[ci skip]

.github/workflows/ci.yml

@@ -17,59 +17,18 @@ env:
   DEFAULT_PYTHON_VERSION: "3.11"
   NLTK_DATA: "/usr/share/nltk_data"
 jobs:
-  detect-duplicate:
-    name: Detect Duplicate Run
-    runs-on: ubuntu-24.04
-    outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
-    steps:
-      - name: Check if workflow should run
-        id: check
-        uses: actions/github-script@v8
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            if (context.eventName !== 'push') {
-              core.info('Not a push event; running workflow.');
-              core.setOutput('should_run', 'true');
-              return;
-            }
-
-            const ref = context.ref || '';
-            if (!ref.startsWith('refs/heads/')) {
-              core.info('Push is not to a branch; running workflow.');
-              core.setOutput('should_run', 'true');
-              return;
-            }
-
-            const branch = ref.substring('refs/heads/'.length);
-            const { owner, repo } = context.repo;
-            const prs = await github.paginate(github.rest.pulls.list, {
-              owner,
-              repo,
-              state: 'open',
-              head: `${owner}:${branch}`,
-              per_page: 100,
-            });
-
-            if (prs.length === 0) {
-              core.info(`No open PR found for ${branch}; running workflow.`);
-              core.setOutput('should_run', 'true');
-            } else {
-              core.info(`Found ${prs.length} open PR(s) for ${branch}; skipping duplicate push run.`);
-              core.setOutput('should_run', 'false');
-            }
   pre-commit:
-    needs:
-      - detect-duplicate
-    if: needs.detect-duplicate.outputs.should_run == 'true'
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run
+    # by the push to the branch. Without this if check, checks are duplicated since
+    # internal PRs match both the push and pull_request events.
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     name: Linting Checks
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
       - name: Install python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Check files
@@ -84,7 +43,7 @@ jobs:
         uses: actions/checkout@v5
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
@@ -138,7 +97,7 @@ jobs:
           docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml up --detach
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "${{ matrix.python-version }}"
       - name: Install uv
@@ -183,11 +142,13 @@ jobs:
         if: always()
         uses: codecov/test-results-action@v1
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: backend-python-${{ matrix.python-version }}
           files: junit.xml
       - name: Upload backend coverage to Codecov
         uses: codecov/codecov-action@v5
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: backend-python-${{ matrix.python-version }}
           files: coverage.xml
       - name: Stop containers
@@ -207,7 +168,7 @@ jobs:
         with:
           version: 10
       - name: Use Node.js 20
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
           cache: 'pnpm'
@@ -240,7 +201,7 @@ jobs:
         with:
           version: 10
       - name: Use Node.js 20
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
           cache: 'pnpm'
@@ -263,11 +224,13 @@ jobs:
         uses: codecov/test-results-action@v1
         if: always()
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: frontend-node-${{ matrix.node-version }}
           directory: src-ui/
       - name: Upload frontend coverage to Codecov
         uses: codecov/codecov-action@v5
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: frontend-node-${{ matrix.node-version }}
           directory: src-ui/coverage/
   tests-frontend-e2e:
@@ -288,7 +251,7 @@ jobs:
         with:
           version: 10
       - name: Use Node.js 20
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
           cache: 'pnpm'
@@ -331,7 +294,7 @@ jobs:
         with:
           version: 10
       - name: Use Node.js 20
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
           cache: 'pnpm'
@@ -473,7 +436,7 @@ jobs:
         uses: actions/checkout@v5
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
@@ -621,7 +584,7 @@ jobs:
           ref: main
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
@@ -653,7 +616,7 @@ jobs:
           git commit -am "Changelog ${{ needs.publish-release.outputs.version }} - GHA"
           git push origin ${{ needs.publish-release.outputs.version }}-changelog
       - name: Create Pull Request
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           script: |
             const { repo, owner } = context.repo;

.github/workflows/cleanup-tags.yml

@@ -6,9 +6,10 @@
 # This workflow will not trigger runs on forked repos.
 name: Cleanup Image Tags
 on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * 0'
+  delete:
+  push:
+    paths:
+      - ".github/workflows/cleanup-tags.yml"
 concurrency:
   group: registry-tags-cleanup
   cancel-in-progress: false

.github/workflows/pr-bot.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Label PR by file path or branch name
         # see .github/labeler.yml for the labeler config
-        uses: actions/labeler@v6
+        uses: actions/labeler@v5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Label by size
@@ -26,7 +26,7 @@ jobs:
           fail_if_xl: 'false'
           excluded_files: /\.lock$/ /\.txt$/ ^src-ui/pnpm-lock\.yaml$ ^src-ui/messages\.xlf$ ^src/locale/en_US/LC_MESSAGES/django\.po$
       - name: Label by PR title
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           script: |
             const pr = context.payload.pull_request;
@@ -52,7 +52,7 @@ jobs:
             }
       - name: Label bot-generated PRs
         if: ${{ contains(github.actor, 'dependabot') || contains(github.actor, 'crowdin-bot') }}
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           script: |
             const pr = context.payload.pull_request;
@@ -77,7 +77,7 @@ jobs:
             }
       - name: Welcome comment
         if: ${{ !contains(github.actor, 'bot') }}
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           script: |
             const pr = context.payload.pull_request;

.github/workflows/repo-maintenance.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v9
         with:
           days-before-stale: 7
           days-before-close: 14
@@ -57,7 +57,7 @@ jobs:
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
         with:
           script: |
             function sleep(ms) {
@@ -114,7 +114,7 @@ jobs:
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
         with:
           script: |
             function sleep(ms) {
@@ -206,7 +206,7 @@ jobs:
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
         with:
           script: |
             function sleep(ms) {
@@ -241,7 +241,6 @@ jobs:
                 ) {
                   nodes {
                     id,
-                    createdAt,
                     number,
                     updatedAt,
                     upvoteCount,

.github/workflows/translate-strings.yml

@@ -17,7 +17,7 @@ jobs:
           ref: ${{ github.head_ref }}
       - name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
       - name: Install system dependencies
         run: |
           sudo apt-get update -qq
@@ -38,7 +38,7 @@ jobs:
         with:
           version: 10
       - name: Use Node.js 20
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
           cache: 'pnpm'

.pre-commit-config.yaml

@@ -49,17 +49,17 @@ repos:
           - 'prettier-plugin-organize-imports@4.1.0'
   # Python hooks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.0
+    rev: v0.13.0
     hooks:
       - id: ruff-check
       - id: ruff-format
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.11.0"
+    rev: "v2.6.0"
     hooks:
       - id: pyproject-fmt
   # Dockerfile hooks
   - repo: https://github.com/AleksaC/hadolint-py
-    rev: v2.14.0
+    rev: v2.12.1b3
     hooks:
       - id: hadolint
   # Shell script hooks
@@ -76,9 +76,7 @@ repos:
     hooks:
       - id: shellcheck
   - repo: https://github.com/google/yamlfmt
-    rev: v0.18.0
+    rev: v0.17.2
     hooks:
       - id: yamlfmt
         exclude: "^src-ui/pnpm-lock.yaml"
-        types:
-          - yaml

CONTRIBUTING.md

@@ -2,11 +2,9 @@
 
 If you feel like contributing to the project, please do! Bug fixes and improvements are always welcome.
 
-⚠️ Please note: Pull requests that implement a new feature or enhancement _should almost always target an existing feature request_ with evidence of community interest and discussion. This is in order to balance the work of implementing and maintaining new features / enhancements. Pull requests that are opened without meeting this requirement may not be merged.
-
 If you want to implement something big:
 
-- As above, please start with a discussion! Maybe something similar is already in development and we can make it happen together.
+- Please start a discussion about that in the issues! Maybe something similar is already in development and we can make it happen together.
 - When making additions to the project, consider if the majority of users will benefit from your change. If not, you're probably better of forking the project.
 - Also consider if your change will get in the way of other users. A good change is a change that enhances the experience of some users who want that change and does not affect users who do not care about the change.
 - Please see the [paperless-ngx merge process](#merging-prs) below.
@@ -135,7 +133,7 @@ community members. That said, in an effort to keep the repository organized and
 - Issues, pull requests and discussions that are closed will be locked after 30 days of inactivity.
 - Discussions with a marked answer will be automatically closed.
 - Discussions in the 'General' or 'Support' categories will be closed after 180 days of inactivity.
-- Feature requests that do not meet the following thresholds will be closed: 180 days of inactivity with less than 80 "up-votes", < 5 "up-votes" after 180 days, < 20 "up-votes" after 1 year or < 40 "up-votes" at 2 years.
+- Feature requests that do not meet the following thresholds will be closed: 180 days of inactivity, < 5 "up-votes" after 180 days, < 20 "up-votes" after 1 year or < 80 "up-votes" at 2 years.
 
 In all cases, threads can be re-opened by project maintainers and, of course, users can always create a new discussion for related concerns.
 Finally, remember that all information remains searchable and 'closed' feature requests can still serve as inspiration for new features.

Dockerfile

@@ -32,7 +32,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.9.2-python3.12-bookworm-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.8.17-python3.12-bookworm-slim AS s6-overlay-base
 
 WORKDIR /usr/src/s6
 

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

@@ -4,7 +4,7 @@
 # correct networking for the tests
 services:
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.24
+    image: docker.io/gotenberg/gotenberg:8.23
     hostname: gotenberg
     container_name: gotenberg
     network_mode: host

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.24
+    image: docker.io/gotenberg/gotenberg:8.23
     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

@@ -32,7 +32,7 @@ services:
     volumes:
       - redisdata:/data
   db:
-    image: docker.io/library/postgres:18
+    image: docker.io/library/postgres:17
     restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data

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

@@ -35,7 +35,7 @@ services:
     volumes:
       - redisdata:/data
   db:
-    image: docker.io/library/postgres:18
+    image: docker.io/library/postgres:17
     restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data
@@ -66,7 +66,7 @@ services:
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.24
+    image: docker.io/gotenberg/gotenberg:8.23
     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.postgres.yml

@@ -31,7 +31,7 @@ services:
     volumes:
       - redisdata:/data
   db:
-    image: docker.io/library/postgres:18
+    image: docker.io/library/postgres:17
     restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data

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

@@ -55,7 +55,7 @@ services:
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.24
+    image: docker.io/gotenberg/gotenberg:8.23
     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/install_management_commands.sh

@@ -11,7 +11,6 @@ for command in decrypt_documents \
 	mail_fetcher \
 	document_create_classifier \
 	document_index \
-	document_llmindex \
 	document_renamer \
 	document_retagger \
 	document_thumbnails \

docker/rootfs/usr/local/bin/document_llmindex

@@ -1,14 +0,0 @@
-#!/command/with-contenv /usr/bin/bash
-# shellcheck shell=bash
-
-set -e
-
-cd "${PAPERLESS_SRC_DIR}"
-
-if [[ $(id -u) == 0 ]]; then
-	s6-setuidgid paperless python3 manage.py document_llmindex "$@"
-elif [[ $(id -un) == "paperless" ]]; then
-	python3 manage.py document_llmindex "$@"
-else
-	echo "Unknown user."
-fi

docs/configuration.md

@@ -170,11 +170,11 @@ Available options are `postgresql` and `mariadb`.
 
     !!! note
 
-        A small pool is typically sufficient — for example, a size of 4.
-        Make sure your PostgreSQL server's max_connections setting is large enough to handle:
-        ```(Paperless workers + Celery workers) × pool size + safety margin```
-        For example, with 4 Paperless workers and 2 Celery workers, and a pool size of 4:
-        (4 + 2) × 4 + 10 = 34 connections required.
+    A small pool is typically sufficient — for example, a size of 4.
+    Make sure your PostgreSQL server's max_connections setting is large enough to handle:
+    ```(Paperless workers + Celery workers) × pool size + safety margin```
+    For example, with 4 Paperless workers and 2 Celery workers, and a pool size of 4:
+    (4 + 2) × 4 + 10 = 34 connections required.
 
 #### [`PAPERLESS_DB_READ_CACHE_ENABLED=<bool>`](#PAPERLESS_DB_READ_CACHE_ENABLED) {#PAPERLESS_DB_READ_CACHE_ENABLED}
 
@@ -184,9 +184,9 @@ Available options are `postgresql` and `mariadb`.
 
     !!! danger
 
-        **Do not modify the database outside the application while it is running.**
-        This includes actions such as restoring a backup, upgrading the database, or performing manual inserts. All external modifications must be done **only when the application is stopped**.
-        After making any such changes, you **must invalidate the DB read cache** using the `invalidate_cachalot` management command.
+    **Do not modify the database outside the application while it is running.**
+    This includes actions such as restoring a backup, upgrading the database, or performing manual inserts. All external modifications must be done **only when the application is stopped**.
+    After making any such changes, you **must invalidate the DB read cache** using the `invalidate_cachalot` management command.
 
 #### [`PAPERLESS_READ_CACHE_TTL=<int>`](#PAPERLESS_READ_CACHE_TTL) {#PAPERLESS_READ_CACHE_TTL}
 
@@ -196,7 +196,7 @@ Available options are `postgresql` and `mariadb`.
 
     !!! warning
 
-        A high TTL increases memory usage over time. Memory may be used until end of TTL, even if the cache is invalidated with the `invalidate_cachalot` command.
+    A high TTL increases memory usage over time. Memory may be used until end of TTL, even if the cache is invalidated with the `invalidate_cachalot` command.
 
 In case of an out-of-memory (OOM) situation, Redis may stop accepting new data — including cache entries, scheduled tasks, and documents to consume.
 If your system has limited RAM, consider configuring a dedicated Redis instance for the read cache, with a memory limit and the eviction policy set to `allkeys-lru`.
@@ -1759,11 +1759,6 @@ started by the container.
 
 : Path to an image file in the /media/logo directory, must include 'logo', e.g. `/logo/Atari_logo.svg`
 
-!!! note
-
-    The logo file will be viewable by anyone with access to the Paperless instance login page,
-    so consider your choice of logo carefully and removing exif data from images before uploading.
-
 #### [`PAPERLESS_ENABLE_UPDATE_CHECK=<bool>`](#PAPERLESS_ENABLE_UPDATE_CHECK) {#PAPERLESS_ENABLE_UPDATE_CHECK}
 
 !!! note
@@ -1805,67 +1800,3 @@ password. All of these options come from their similarly-named [Django settings]
 #### [`PAPERLESS_EMAIL_USE_SSL=<bool>`](#PAPERLESS_EMAIL_USE_SSL) {#PAPERLESS_EMAIL_USE_SSL}
 
 : Defaults to false.
-
-## AI {#ai}
-
-#### [`PAPERLESS_AI_ENABLED=<bool>`](#PAPERLESS_AI_ENABLED) {#PAPERLESS_AI_ENABLED}
-
-: Enables the AI features in Paperless. This includes the AI-based
-suggestions. This setting is required to be set to true in order to use the AI features.
-
-    Defaults to false.
-
-#### [`PAPERLESS_AI_LLM_EMBEDDING_BACKEND=<str>`](#PAPERLESS_AI_LLM_EMBEDDING_BACKEND) {#PAPERLESS_AI_LLM_EMBEDDING_BACKEND}
-
-: The embedding backend to use for RAG. This can be either "openai" or "huggingface".
-
-    Defaults to None.
-
-#### [`PAPERLESS_AI_LLM_EMBEDDING_MODEL=<str>`](#PAPERLESS_AI_LLM_EMBEDDING_MODEL) {#PAPERLESS_AI_LLM_EMBEDDING_MODEL}
-
-: The model to use for the embedding backend for RAG. This can be set to any of the embedding models supported by the current embedding backend. If not supplied, defaults to "text-embedding-3-small" for OpenAI and "sentence-transformers/all-MiniLM-L6-v2" for Huggingface.
-
-    Defaults to None.
-
-#### [`PAPERLESS_AI_BACKEND=<str>`](#PAPERLESS_AI_BACKEND) {#PAPERLESS_AI_BACKEND}
-
-: The AI backend to use. This can be either "openai" or "ollama". If set to "ollama", the AI
-features will be run locally on your machine. If set to "openai", the AI features will be run
-using the OpenAI API. This setting is required to be set to use the AI features.
-
-    Defaults to None.
-
-    !!! note
-
-        The OpenAI API is a paid service. You will need to set up an OpenAI account and
-        will be charged for usage incurred by Paperless-ngx features and your document data
-        will (of course) be sent to the OpenAI API. Paperless-ngx does not endorse the use of the
-        OpenAI API in any way.
-
-        Refer to the OpenAI terms of service, and use at your own risk.
-
-#### [`PAPERLESS_AI_LLM_MODEL=<str>`](#PAPERLESS_AI_LLM_MODEL) {#PAPERLESS_AI_LLM_MODEL}
-
-: The model to use for the AI backend, i.e. "gpt-3.5-turbo", "gpt-4" or any of the models supported by the
-current backend. If not supplied, defaults to "gpt-3.5-turbo" for OpenAI and "llama3" for Ollama.
-
-    Defaults to None.
-
-#### [`PAPERLESS_AI_LLM_API_KEY=<str>`](#PAPERLESS_AI_LLM_API_KEY) {#PAPERLESS_AI_LLM_API_KEY}
-
-: The API key to use for the AI backend. This is required for the OpenAI backend only.
-
-    Defaults to None.
-
-#### [`PAPERLESS_AI_LLM_ENDPOINT=<str>`](#PAPERLESS_AI_LLM_ENDPOINT) {#PAPERLESS_AI_LLM_ENDPOINT}
-
-: The endpoint / url to use for the AI backend. This is required for the Ollama backend only.
-
-    Defaults to None.
-
-#### [`PAPERLESS_AI_LLM_INDEX_TASK_CRON=<cron expression>`](#PAPERLESS_AI_LLM_INDEX_TASK_CRON) {#PAPERLESS_AI_LLM_INDEX_TASK_CRON}
-
-: Configures the schedule to update the AI embeddings of text content and metadata for all documents. Only performed if
-AI is enabled and the LLM embedding backend is set.
-
-    Defaults to `10 2 * * *`, once per day.

docs/index.md

@@ -25,12 +25,11 @@ physical documents into a searchable online archive so you can keep, well, _less
 ## Features
 
 -   **Organize and index** your scanned documents with tags, correspondents, types, and more.
--   _Your_ data is stored locally on _your_ server and is never transmitted or shared in any way, unless you explicitly choose to do so.
+-   _Your_ data is stored locally on _your_ server and is never transmitted or shared in any way.
 -   Performs **OCR** on your documents, adding searchable and selectable text, even to documents scanned with only images.
 -   Utilizes the open-source Tesseract engine to recognize more than 100 languages.
 -   Documents are saved as PDF/A format which is designed for long term storage, alongside the unaltered originals.
 -   Uses machine-learning to automatically add tags, correspondents and document types to your documents.
--   **New**: Paperless-ngx can now leverage AI (Large Language Models or LLMs) for document suggestions. This is an optional feature that can be enabled (and is disabled by default).
 -   Supports PDF documents, images, plain text files, Office documents (Word, Excel, PowerPoint, and LibreOffice equivalents)[^1] and more.
 -   Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and their format can be configured freely with different configurations assigned to different documents.
 -   **Beautiful, modern web application** that features:

docs/usage.md

@@ -261,10 +261,6 @@ different means. These are as follows:
 Paperless is set up to check your mails every 10 minutes. This can be
 configured via [`PAPERLESS_EMAIL_TASK_CRON`](configuration.md#PAPERLESS_EMAIL_TASK_CRON)
 
-#### Processed Mail
-
-Paperless keeps track of emails it has processed in order to avoid processing the same mail multiple times. This uses the message `UID` provided by the mail server, which should be unique for each message. You can view and manage processed mails from the web UI under Mail > Processed Mails. If you need to re-process a message, you can delete the corresponding processed mail entry, which will allow Paperless-ngx to process the email again the next time the mail fetch task runs.
-
 #### OAuth Email Setup
 
 Paperless-ngx supports OAuth2 authentication for Gmail and Outlook email accounts. To set up an email account with OAuth2, you will need to create a 'developer' app with the respective provider and obtain the client ID and client secret and set the appropriate [configuration variables](configuration.md#email_oauth). You will also need to set either [`PAPERLESS_OAUTH_CALLBACK_BASE_URL`](configuration.md#PAPERLESS_OAUTH_CALLBACK_BASE_URL) or [`PAPERLESS_URL`](configuration.md#PAPERLESS_URL) to the correct value for the OAuth2 flow to work correctly.
@@ -278,28 +274,6 @@ Once setup, navigating to the email settings page in Paperless-ngx will allow yo
 You can also submit a document using the REST API, see [POSTing documents](api.md#file-uploads)
 for details.
 
-## Document Suggestions
-
-Paperless-ngx can suggest tags, correspondents, document types and storage paths for documents based on the content of the document. This is done using a (non-LLM) machine learning model that is trained on the documents in your database. The suggestions are shown in the document detail page and can be accepted or rejected by the user.
-
-## AI Features
-
-Paperless-ngx includes several features that use AI to enhance the document management experience. These features are optional and can be enabled or disabled in the settings. If you are using the AI features, you may want to also enable the "LLM index" feature, which supports Retrieval-Augmented Generation (RAG) designed to improve the quality of AI responses. The LLM index feature is not enabled by default and requires additional configuration.
-
-!!! warning
-
-    Remember that Paperless-ngx will send document content to the AI provider you have configured, so consider the privacy implications of using these features, especially if using a remote model (e.g. OpenAI), instead of the default local model.
-
-The AI features work by creating an embedding of the text content and metadata of documents, which is then used for various tasks such as similarity search and question answering. This uses the FAISS vector store.
-
-### AI-Enhanced Suggestions
-
-If enabled, Paperless-ngx can use an AI LLM model to suggest document titles, dates, tags, correspondents and document types for documents. This feature will always be "opt-in" and does not disable the existing classifier-based suggestion system. Currently, both remote (via the OpenAI API) and local (via Ollama) models are supported, see [configuration](configuration.md#ai) for details.
-
-### Document Chat
-
-Paperless-ngx can use an AI LLM model to answer questions about a document or across multiple documents. Again, this feature works best when RAG is enabled. The chat feature is available in the upper app toolbar and will switch between chatting across multiple documents or a single document based on the current view.
-
 ## Sharing documents from Paperless-ngx
 
 Paperless-ngx supports sharing documents with other users by assigning them [permissions](#object-permissions)
@@ -436,7 +410,7 @@ fields and permissions, which will be merged.
 
 #### Types {#workflow-trigger-types}
 
-Currently, there are four events that correspond to workflow trigger 'types':
+Currently, there are three events that correspond to workflow trigger 'types':
 
 1. **Consumption Started**: _before_ a document is consumed, so events can include filters by source (mail, consumption
    folder or API), file path, file name, mail rule
@@ -449,7 +423,7 @@ Currently, there are four events that correspond to workflow trigger 'types':
    added, created, updated date or you can specify a (date) custom field. You can also specify a day offset from the date (positive
    offsets will trigger after the date, negative offsets will trigger before).
 
-The following flow diagram illustrates the four document trigger types:
+The following flow diagram illustrates the three document trigger types:
 
 ```mermaid
 flowchart TD
@@ -484,24 +458,15 @@ flowchart TD
 Workflows allow you to filter by:
 
 -   Source, e.g. documents uploaded via consume folder, API (& the web UI) and mail fetch
--   File name, including wildcards e.g. \*.pdf will apply to all pdfs.
+-   File name, including wildcards e.g. \*.pdf will apply to all pdfs
 -   File path, including wildcards. Note that enabling `PAPERLESS_CONSUMER_RECURSIVE` would allow, for
     example, automatically assigning documents to different owners based on the upload directory.
 -   Mail rule. Choosing this option will force 'mail fetch' to be the workflow source.
 -   Content matching (`Added`, `Updated` and `Scheduled` triggers only). Filter document content using the matching settings.
-
-There are also 'advanced' filters available for `Added`, `Updated` and `Scheduled` triggers:
-
--   Any Tags: Filter for documents with any of the specified tags.
--   All Tags: Filter for documents with all of the specified tags.
--   No Tags: Filter for documents with none of the specified tags.
--   Document type: Filter documents with this document type.
--   Not Document types: Filter documents without any of these document types.
--   Correspondent: Filter documents with this correspondent.
--   Not Correspondents: Filter documents without any of these correspondents.
--   Storage path: Filter documents with this storage path.
--   Not Storage paths: Filter documents without any of these storage paths.
--   Custom field query: Filter documents with a custom field query (the same as used for the document list filters).
+-   Tags (`Added`, `Updated` and `Scheduled` triggers only). Filter for documents with any of the specified tags
+-   Document type (`Added`, `Updated` and `Scheduled` triggers only). Filter documents with this doc type
+-   Correspondent (`Added`, `Updated` and `Scheduled` triggers only). Filter documents with this correspondent
+-   Storage path (`Added`, `Updated` and `Scheduled` triggers only). Filter documents with this storage path
 
 ### Workflow Actions
 
@@ -668,7 +633,7 @@ When you first delete a document it is moved to the 'trash' until either it is e
 You can set how long documents remain in the trash before being automatically deleted with [`PAPERLESS_EMPTY_TRASH_DELAY`](configuration.md#PAPERLESS_EMPTY_TRASH_DELAY), which defaults
 to 30 days. Until the file is actually deleted (e.g. the trash is emptied), all files and database content remains intact and can be restored at any point up until that time.
 
-Additionally you may configure a directory where deleted files are moved to when the trash is emptied with [`PAPERLESS_EMPTY_TRASH_DIR`](configuration.md#PAPERLESS_EMPTY_TRASH_DIR).
+Additionally you may configure a directory where deleted files are moved to when they the trash is emptied with [`PAPERLESS_EMPTY_TRASH_DIR`](configuration.md#PAPERLESS_EMPTY_TRASH_DIR).
 Note that the empty trash directory only stores the original file, the archive file and all database information is permanently removed once a document is fully deleted.
 
 ## Best practices {#basic-searching}

pyproject.toml

@@ -10,7 +10,6 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
-  "Programming Language :: Python :: 3.14",
 ]
 # TODO: Move certain things to groups and then utilize that further
 # This will allow testing to not install a webserver, mysql, etc
@@ -26,15 +25,15 @@ dependencies = [
   # WARNING: django does not use semver.
   #          Only patch versions are guaranteed to not introduce breaking changes.
   "django~=5.2.5",
-  "django-allauth[mfa,socialaccount]~=65.4.0",
+  "django-allauth[socialaccount,mfa]~=65.4.0",
   "django-auditlog~=3.2.1",
   "django-cachalot~=2.8.0",
   "django-celery-results~=2.6.0",
   "django-compression-middleware~=0.5.0",
-  "django-cors-headers~=4.9.0",
+  "django-cors-headers~=4.8.0",
   "django-extensions~=4.1",
   "django-filter~=25.1",
-  "django-guardian~=3.2.0",
+  "django-guardian~=3.1.2",
   "django-multiselectfield~=1.0.1",
   "django-soft-delete~=1.0.18",
   "django-treenode>=0.23.2",
@@ -43,26 +42,19 @@ dependencies = [
   "drf-spectacular~=0.28",
   "drf-spectacular-sidecar~=2025.9.1",
   "drf-writable-nested~=0.7.1",
-  "faiss-cpu>=1.10",
-  "filelock~=3.20.0",
+  "filelock~=3.19.1",
   "flower~=2.0.1",
-  "gotenberg-client~=0.12.0",
+  "gotenberg-client~=0.11.0",
   "httpx-oauth~=0.16",
   "imap-tools~=1.11.0",
   "inotifyrecursive~=0.3",
   "jinja2~=3.1.5",
   "langdetect~=1.0.9",
-  "llama-index-core>=0.12.33.post1",
-  "llama-index-embeddings-huggingface>=0.5.3",
-  "llama-index-embeddings-openai>=0.3.1",
-  "llama-index-llms-ollama>=0.5.4",
-  "llama-index-llms-openai>=0.3.38",
-  "llama-index-vector-stores-faiss>=0.3",
   "nltk~=3.9.1",
   "ocrmypdf~=16.11.0",
-  "openai>=1.76",
   "pathvalidate~=3.3.1",
   "pdf2image~=1.17.0",
+  "psycopg-pool",
   "python-dateutil~=2.9.0",
   "python-dotenv~=1.1.0",
   "python-gnupg~=0.5.4",
@@ -72,7 +64,6 @@ dependencies = [
   "rapidfuzz~=3.14.0",
   "redis[hiredis]~=5.2.1",
   "scikit-learn~=1.7.0",
-  "sentence-transformers>=4.1",
   "setproctitle~=1.3.4",
   "tika-client~=0.10.0",
   "tqdm~=4.67.1",
@@ -125,8 +116,8 @@ testing = [
 
 lint = [
   "pre-commit~=4.3.0",
-  "pre-commit-uv~=4.2.0",
-  "ruff~=0.14.0",
+  "pre-commit-uv~=4.1.3",
+  "ruff~=0.13.0",
 ]
 
 typing = [
@@ -148,25 +139,6 @@ typing = [
   "types-tqdm",
 ]
 
-[tool.uv]
-required-version = ">=0.5.14"
-package = false
-environments = [
-  "sys_platform == 'darwin'",
-  "sys_platform == 'linux'",
-]
-
-[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-3.2.9/psycopg_c-3.2.9-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-3.2.9/psycopg_c-3.2.9-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
-]
-zxing-cpp = [
-  { url = "https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.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/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
-]
-
 [tool.ruff]
 target-version = "py310"
 line-length = 88
@@ -261,7 +233,6 @@ testpaths = [
   "src/paperless_tesseract/tests/",
   "src/paperless_tika/tests",
   "src/paperless_text/tests/",
-  "src/paperless_ai/tests",
 ]
 addopts = [
   "--pythonwarnings=all",
@@ -314,5 +285,24 @@ disallow_untyped_defs = true
 warn_redundant_casts = true
 warn_unused_ignores = true
 
+[tool.uv]
+required-version = ">=0.5.14"
+package = false
+environments = [
+  "sys_platform == 'darwin'",
+  "sys_platform == 'linux'",
+]
+
+[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-3.2.9/psycopg_c-3.2.9-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-3.2.9/psycopg_c-3.2.9-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
+]
+zxing-cpp = [
+  { url = "https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.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/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
+]
+
 [tool.django-stubs]
 django_settings_module = "paperless.settings"

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

@@ -174,7 +174,7 @@ test('bulk edit', async ({ page }) => {
   await expect(page.locator('pngx-document-list')).toHaveText(
     /Selected 61 of 61 documents/i
   )
-  await page.getByRole('button', { name: 'None' }).click()
+  await page.getByRole('button', { name: 'Cancel' }).click()
 
   await page.locator('pngx-document-card-small').nth(1).click()
   await page.locator('pngx-document-card-small').nth(2).click()

src-ui/package.json

@@ -11,17 +11,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/cdk": "^20.2.6",
-    "@angular/common": "~20.3.2",
-    "@angular/compiler": "~20.3.2",
-    "@angular/core": "~20.3.2",
-    "@angular/forms": "~20.3.2",
-    "@angular/localize": "~20.3.2",
-    "@angular/platform-browser": "~20.3.2",
-    "@angular/platform-browser-dynamic": "~20.3.2",
-    "@angular/router": "~20.3.2",
+    "@angular/cdk": "^20.2.2",
+    "@angular/common": "~20.2.4",
+    "@angular/compiler": "~20.2.4",
+    "@angular/core": "~20.2.4",
+    "@angular/forms": "~20.2.4",
+    "@angular/localize": "~20.2.4",
+    "@angular/platform-browser": "~20.2.4",
+    "@angular/platform-browser-dynamic": "~20.2.4",
+    "@angular/router": "~20.2.4",
     "@ng-bootstrap/ng-bootstrap": "^19.0.1",
-    "@ng-select/ng-select": "^20.2.2",
+    "@ng-select/ng-select": "^20.1.3",
     "@ngneat/dirty-check-forms": "^3.0.3",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.8",
@@ -29,48 +29,47 @@
     "mime-names": "^1.0.0",
     "ng2-pdf-viewer": "^10.4.0",
     "ngx-bootstrap-icons": "^1.9.3",
-    "ngx-color": "^10.1.0",
+    "ngx-color": "^10.0.0",
     "ngx-cookie-service": "^20.1.0",
     "ngx-device-detector": "^10.1.0",
     "ngx-ui-tour-ng-bootstrap": "^17.0.1",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "utif": "^3.1.0",
-    "uuid": "^13.0.0",
+    "uuid": "^11.1.0",
     "zone.js": "^0.15.1"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "^20.0.0",
     "@angular-builders/jest": "^20.0.0",
-    "@angular-devkit/core": "^20.3.3",
-    "@angular-devkit/schematics": "^20.3.3",
-    "@angular-eslint/builder": "20.3.0",
-    "@angular-eslint/eslint-plugin": "20.3.0",
-    "@angular-eslint/eslint-plugin-template": "20.3.0",
-    "@angular-eslint/schematics": "20.3.0",
-    "@angular-eslint/template-parser": "20.3.0",
-    "@angular/build": "^20.3.3",
-    "@angular/cli": "~20.3.3",
-    "@angular/compiler-cli": "~20.3.2",
+    "@angular-devkit/core": "^20.2.2",
+    "@angular-devkit/schematics": "^20.2.2",
+    "@angular-eslint/builder": "20.2.0",
+    "@angular-eslint/eslint-plugin": "20.2.0",
+    "@angular-eslint/eslint-plugin-template": "20.2.0",
+    "@angular-eslint/schematics": "20.2.0",
+    "@angular-eslint/template-parser": "20.2.0",
+    "@angular/build": "^20.2.2",
+    "@angular/cli": "~20.2.2",
+    "@angular/compiler-cli": "~20.2.4",
     "@codecov/webpack-plugin": "^1.9.1",
-    "@playwright/test": "^1.55.1",
+    "@playwright/test": "^1.55.0",
     "@types/jest": "^30.0.0",
-    "@types/node": "^24.6.1",
-    "@typescript-eslint/eslint-plugin": "^8.45.0",
-    "@typescript-eslint/parser": "^8.45.0",
-    "@typescript-eslint/utils": "^8.45.0",
-    "eslint": "^9.36.0",
-    "jest": "30.2.0",
-    "jest-environment-jsdom": "^30.2.0",
+    "@types/node": "^24.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.41.0",
+    "@typescript-eslint/parser": "^8.41.0",
+    "@typescript-eslint/utils": "^8.41.0",
+    "eslint": "^9.34.0",
+    "jest": "30.1.3",
+    "jest-environment-jsdom": "^30.1.2",
     "jest-junit": "^16.0.0",
-    "jest-preset-angular": "^15.0.2",
+    "jest-preset-angular": "^15.0.0",
     "jest-websocket-mock": "^2.5.0",
-    "prettier-plugin-organize-imports": "^4.3.0",
+    "prettier-plugin-organize-imports": "^4.2.0",
     "ts-node": "~10.9.1",
     "typescript": "^5.8.3",
-    "webpack": "^5.102.0"
+    "webpack": "^5.101.3"
   },
-  "packageManager": "pnpm@10.17.1",
   "pnpm": {
     "onlyBuiltDependencies": [
       "@parcel/watcher",

src-ui/setup-jest.ts

@@ -145,14 +145,4 @@ HTMLCanvasElement.prototype.getContext = <
   typeof HTMLCanvasElement.prototype.getContext
 >jest.fn()
 
-jest.mock('uuid', () => ({
-  v4: jest.fn(() =>
-    'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (char: string) => {
-      const random = Math.floor(Math.random() * 16)
-      const value = char === 'x' ? random : (random & 0x3) | 0x8
-      return value.toString(16)
-    })
-  ),
-}))
-
 jest.mock('pdfjs-dist')

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

@@ -35,12 +35,8 @@
                                                     @case (ConfigOptionType.String) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
                                                     @case (ConfigOptionType.JSON) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
                                                     @case (ConfigOptionType.File) { <pngx-input-file [formControlName]="option.key" (upload)="uploadFile($event, option.key)" [error]="errors[option.key]"></pngx-input-file> }
-                                                    @case (ConfigOptionType.Password) { <pngx-input-password [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-password> }
                                                 }
                                             </div>
-                                            @if (option.note) {
-                                                <div class="form-text fst-italic">{{option.note}}</div>
-                                            }
                                         </div>
                                     </div>
                                 </div>

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

@@ -29,7 +29,6 @@ import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { FileComponent } from '../../common/input/file/file.component'
 import { NumberComponent } from '../../common/input/number/number.component'
-import { PasswordComponent } from '../../common/input/password/password.component'
 import { SelectComponent } from '../../common/input/select/select.component'
 import { SwitchComponent } from '../../common/input/switch/switch.component'
 import { TextComponent } from '../../common/input/text/text.component'
@@ -47,7 +46,6 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
     TextComponent,
     NumberComponent,
     FileComponent,
-    PasswordComponent,
     AsyncPipe,
     NgbNavModule,
     FormsModule,

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

@@ -92,9 +92,6 @@ const status: SystemStatus = {
     sanity_check_status: SystemStatusItemStatus.ERROR,
     sanity_check_last_run: new Date().toISOString(),
     sanity_check_error: 'Error running sanity check.',
-    llmindex_status: SystemStatusItemStatus.DISABLED,
-    llmindex_last_modified: new Date().toISOString(),
-    llmindex_error: null,
   },
 }
 

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

@@ -16,7 +16,6 @@ import {
   NgbNavItem,
 } from '@ng-bootstrap/ng-bootstrap'
 import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { throwError } from 'rxjs'
 import { routes } from 'src/app/app-routing.module'
 import {
   PaperlessTask,
@@ -29,7 +28,6 @@ import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { PermissionsService } from 'src/app/services/permissions.service'
 import { TasksService } from 'src/app/services/tasks.service'
-import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
@@ -125,7 +123,6 @@ describe('TasksComponent', () => {
   let router: Router
   let httpTestingController: HttpTestingController
   let reloadSpy
-  let toastService: ToastService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -160,7 +157,6 @@ describe('TasksComponent', () => {
     httpTestingController = TestBed.inject(HttpTestingController)
     modalService = TestBed.inject(NgbModal)
     router = TestBed.inject(Router)
-    toastService = TestBed.inject(ToastService)
     fixture = TestBed.createComponent(TasksComponent)
     component = fixture.componentInstance
     jest.useFakeTimers()
@@ -253,42 +249,6 @@ describe('TasksComponent', () => {
     expect(dismissSpy).toHaveBeenCalledWith(selected)
   })
 
-  it('should show an error and re-enable modal buttons when dismissing multiple tasks fails', () => {
-    component.selectedTasks = new Set([tasks[0].id, tasks[1].id])
-    const error = new Error('dismiss failed')
-    const toastSpy = jest.spyOn(toastService, 'showError')
-    const dismissSpy = jest
-      .spyOn(tasksService, 'dismissTasks')
-      .mockReturnValue(throwError(() => error))
-
-    let modal: NgbModalRef
-    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
-
-    component.dismissTasks()
-    expect(modal).not.toBeUndefined()
-
-    modal.componentInstance.confirmClicked.emit()
-
-    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(component.selectedTasks.size).toBe(0)
-  })
-
-  it('should show an error when dismissing a single task fails', () => {
-    const error = new Error('dismiss failed')
-    const toastSpy = jest.spyOn(toastService, 'showError')
-    const dismissSpy = jest
-      .spyOn(tasksService, 'dismissTasks')
-      .mockReturnValue(throwError(() => error))
-
-    component.dismissTask(tasks[0])
-
-    expect(dismissSpy).toHaveBeenCalledWith(new Set([tasks[0].id]))
-    expect(toastSpy).toHaveBeenCalledWith('Error dismissing task', error)
-    expect(component.selectedTasks.size).toBe(0)
-  })
-
   it('should support dismiss all tasks', () => {
     let modal: NgbModalRef
     modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))

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

@@ -24,7 +24,6 @@ import { PaperlessTask } from 'src/app/data/paperless-task'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { TasksService } from 'src/app/services/tasks.service'
-import { ToastService } from 'src/app/services/toast.service'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
@@ -73,7 +72,6 @@ export class TasksComponent
   tasksService = inject(TasksService)
   private modalService = inject(NgbModal)
   private readonly router = inject(Router)
-  private readonly toastService = inject(ToastService)
 
   public activeTab: TaskTab
   public selectedTasks: Set<number> = new Set()
@@ -156,19 +154,11 @@ export class TasksComponent
       modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
         modal.componentInstance.buttonsEnabled = false
         modal.close()
-        this.tasksService.dismissTasks(tasks).subscribe({
-          error: (e) => {
-            this.toastService.showError($localize`Error dismissing tasks`, e)
-            modal.componentInstance.buttonsEnabled = true
-          },
-        })
+        this.tasksService.dismissTasks(tasks)
         this.clearSelection()
       })
     } else {
-      this.tasksService.dismissTasks(tasks).subscribe({
-        error: (e) =>
-          this.toastService.showError($localize`Error dismissing task`, e),
-      })
+      this.tasksService.dismissTasks(tasks)
       this.clearSelection()
     }
   }

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

@@ -30,9 +30,6 @@
     </div>
   </div>
   <ul ngbNav class="order-sm-3">
-    @if (aiEnabled) {
-      <pngx-chat></pngx-chat>
-    }
     <pngx-toasts-dropdown></pngx-toasts-dropdown>
     <li ngbDropdown class="nav-item dropdown">
       <button class="btn ps-1 border-0" id="userDropdown" ngbDropdownToggle>

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

@@ -44,7 +44,6 @@ import { SettingsService } from 'src/app/services/settings.service'
 import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
-import { ChatComponent } from '../chat/chat/chat.component'
 import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component'
 import { DocumentDetailComponent } from '../document-detail/document-detail.component'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
@@ -60,7 +59,6 @@ import { ToastsDropdownComponent } from './toasts-dropdown/toasts-dropdown.compo
     DocumentTitlePipe,
     IfPermissionsDirective,
     ToastsDropdownComponent,
-    ChatComponent,
     RouterModule,
     NgClass,
     NgbDropdownModule,
@@ -173,10 +171,6 @@ export class AppFrameComponent
       })
   }
 
-  get aiEnabled(): boolean {
-    return this.settingsService.get(SETTINGS_KEYS.AI_ENABLED)
-  }
-
   closeMenu() {
     this.isMenuCollapsed = true
   }

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

@@ -1,5 +1,5 @@
 
-<li ngbDropdown class="nav-item mx-1" (openChange)="onOpenChange($event)">
+<li ngbDropdown class="nav-item" (openChange)="onOpenChange($event)">
   @if (toasts.length) {
     <span class="badge rounded-pill z-3 pe-none bg-secondary me-2 position-absolute top-0 left-0">{{ toasts.length }}</span>
   }

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

@@ -1,35 +0,0 @@
-
-<li ngbDropdown class="nav-item me-n2" (openChange)="onOpenChange($event)">
-  <button class="btn border-0" id="chatDropdown" ngbDropdownToggle>
-    <i-bs width="1.3em" height="1.3em" name="chatSquareDots"></i-bs>
-  </button>
-  <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) {
-          <div class="message d-flex flex-row small" [class.justify-content-end]="message.role === 'user'">
-            <span class="p-2 m-2" [class.bg-dark]="message.role === 'user'">
-              {{ message.content }}
-              @if (message.isStreaming) { <span class="blinking-cursor">|</span> }
-            </span>
-          </div>
-        }
-        <div #scrollAnchor></div>
-      </div>
-
-      <form class="chat-input">
-        <div class="input-group">
-          <input
-            #chatInput
-            class="form-control form-control-sm" name="chatInput" type="text"
-            [placeholder]="placeholder"
-            [disabled]="loading"
-            [(ngModel)]="input"
-            (keydown)="searchInputKeyDown($event)"
-            />
-          <button class="btn btn-sm btn-secondary" type="button" (click)="sendMessage()" [disabled]="loading">Send</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</li>

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

@@ -1,37 +0,0 @@
-.dropdown-menu {
-  width: var(--pngx-toast-max-width);
-}
-
-.chat-messages {
-  max-height: 350px;
-  overflow-y: auto;
-}
-
-.dropdown-toggle::after {
-  display: none;
-}
-
-.dropdown-item {
-  white-space: initial;
-}
-
-@media screen and (max-width: 400px) {
-  :host ::ng-deep .dropdown-menu-end {
-    right: -3rem;
-  }
-}
-
-.blinking-cursor {
-  font-weight: bold;
-  font-size: 1.2em;
-  animation: blink 1s step-end infinite;
-}
-
-@keyframes blink {
-  from, to {
-    opacity: 0;
-  }
-  50% {
-    opacity: 1;
-  }
-}

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

@@ -1,132 +0,0 @@
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
-import { provideHttpClientTesting } from '@angular/common/http/testing'
-import { ElementRef } from '@angular/core'
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NavigationEnd, Router } from '@angular/router'
-import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { Subject } from 'rxjs'
-import { ChatService } from 'src/app/services/chat.service'
-import { ChatComponent } from './chat.component'
-
-describe('ChatComponent', () => {
-  let component: ChatComponent
-  let fixture: ComponentFixture<ChatComponent>
-  let chatService: ChatService
-  let router: Router
-  let routerEvents$: Subject<NavigationEnd>
-  let mockStream$: Subject<string>
-
-  beforeEach(async () => {
-    TestBed.configureTestingModule({
-      imports: [NgxBootstrapIconsModule.pick(allIcons), ChatComponent],
-      providers: [
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    }).compileComponents()
-
-    fixture = TestBed.createComponent(ChatComponent)
-    router = TestBed.inject(Router)
-    routerEvents$ = new Subject<any>()
-    jest
-      .spyOn(router, 'events', 'get')
-      .mockReturnValue(routerEvents$.asObservable())
-    chatService = TestBed.inject(ChatService)
-    mockStream$ = new Subject<string>()
-    jest
-      .spyOn(chatService, 'streamChat')
-      .mockReturnValue(mockStream$.asObservable())
-    component = fixture.componentInstance
-
-    jest.useFakeTimers()
-
-    fixture.detectChanges()
-
-    component.scrollAnchor.nativeElement.scrollIntoView = jest.fn()
-  })
-
-  it('should update documentId on initialization', () => {
-    jest.spyOn(router, 'url', 'get').mockReturnValue('/documents/123')
-    component.ngOnInit()
-    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)
-  })
-
-  it('should return correct placeholder based on documentId', () => {
-    component.documentId = 123
-    expect(component.placeholder).toBe('Ask a question about this document...')
-    component.documentId = undefined
-    expect(component.placeholder).toBe('Ask a question about a document...')
-  })
-
-  it('should send a message and handle streaming response', () => {
-    component.input = 'Hello'
-    component.sendMessage()
-
-    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')
-    mockStream$.next('Hi there')
-    // advance time to process the typewriter effect
-    jest.advanceTimersByTime(1000)
-    expect(component.messages[1].content).toBe('Hi there')
-
-    mockStream$.complete()
-    expect(component.loading).toBe(false)
-    expect(component.messages[1].isStreaming).toBe(false)
-  })
-
-  it('should handle errors during streaming', () => {
-    component.input = 'Hello'
-    component.sendMessage()
-
-    mockStream$.error('Error')
-    expect(component.messages[1].content).toContain(
-      '⚠️ Error receiving response.'
-    )
-    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'].length).toBe(4)
-  })
-
-  it('should scroll to bottom after sending a message', () => {
-    const scrollSpy = jest.spyOn(
-      ChatComponent.prototype as any,
-      'scrollToBottom'
-    )
-    component.input = 'Test'
-    component.sendMessage()
-    expect(scrollSpy).toHaveBeenCalled()
-  })
-
-  it('should focus chat input when dropdown is opened', () => {
-    const focus = jest.fn()
-    component.chatInput = {
-      nativeElement: { focus: focus },
-    } as unknown as ElementRef<HTMLInputElement>
-
-    component.onOpenChange(true)
-    jest.advanceTimersByTime(15)
-    expect(focus).toHaveBeenCalled()
-  })
-
-  it('should send message on Enter key press', () => {
-    jest.spyOn(component, 'sendMessage')
-    const event = new KeyboardEvent('keydown', { key: 'Enter' })
-    component.searchInputKeyDown(event)
-    expect(component.sendMessage).toHaveBeenCalled()
-  })
-})

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

@@ -1,140 +0,0 @@
-import { Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { NavigationEnd, Router } from '@angular/router'
-import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { filter, map } from 'rxjs'
-import { ChatMessage, ChatService } from 'src/app/services/chat.service'
-
-@Component({
-  selector: 'pngx-chat',
-  imports: [
-    FormsModule,
-    ReactiveFormsModule,
-    NgxBootstrapIconsModule,
-    NgbDropdownModule,
-  ],
-  templateUrl: './chat.component.html',
-  styleUrl: './chat.component.scss',
-})
-export class ChatComponent implements OnInit {
-  public messages: ChatMessage[] = []
-  public loading = false
-  public input: string = ''
-  public documentId!: number
-
-  private chatService: ChatService = inject(ChatService)
-  private router: Router = inject(Router)
-
-  @ViewChild('scrollAnchor') scrollAnchor!: ElementRef<HTMLDivElement>
-  @ViewChild('chatInput') chatInput!: ElementRef<HTMLInputElement>
-
-  private typewriterBuffer: string[] = []
-  private typewriterActive = false
-
-  public get placeholder(): string {
-    return this.documentId
-      ? $localize`Ask a question about this document...`
-      : $localize`Ask a question about a document...`
-  }
-
-  ngOnInit(): void {
-    this.updateDocumentId(this.router.url)
-    this.router.events
-      .pipe(
-        filter((event) => event instanceof NavigationEnd),
-        map((event) => (event as NavigationEnd).url)
-      )
-      .subscribe((url) => {
-        this.updateDocumentId(url)
-      })
-  }
-
-  private updateDocumentId(url: string): void {
-    const docIdRe = url.match(/^\/documents\/(\d+)/)
-    this.documentId = docIdRe ? +docIdRe[1] : undefined
-  }
-
-  sendMessage(): void {
-    if (!this.input.trim()) return
-
-    const userMessage: ChatMessage = { role: 'user', content: this.input }
-    this.messages.push(userMessage)
-    this.scrollToBottom()
-
-    const assistantMessage: ChatMessage = {
-      role: 'assistant',
-      content: '',
-      isStreaming: true,
-    }
-    this.messages.push(assistantMessage)
-    this.loading = true
-
-    let lastPartialLength = 0
-
-    this.chatService.streamChat(this.documentId, this.input).subscribe({
-      next: (chunk) => {
-        const delta = chunk.substring(lastPartialLength)
-        lastPartialLength = chunk.length
-        this.enqueueTypewriter(delta, assistantMessage)
-      },
-      error: () => {
-        assistantMessage.content += '\n\n⚠️ Error receiving response.'
-        assistantMessage.isStreaming = false
-        this.loading = false
-      },
-      complete: () => {
-        assistantMessage.isStreaming = false
-        this.loading = false
-        this.scrollToBottom()
-      },
-    })
-
-    this.input = ''
-  }
-
-  enqueueTypewriter(chunk: string, message: ChatMessage): void {
-    if (!chunk) return
-
-    this.typewriterBuffer.push(...chunk.split(''))
-
-    if (!this.typewriterActive) {
-      this.typewriterActive = true
-      this.playTypewriter(message)
-    }
-  }
-
-  playTypewriter(message: ChatMessage): void {
-    if (this.typewriterBuffer.length === 0) {
-      this.typewriterActive = false
-      return
-    }
-
-    const nextChar = this.typewriterBuffer.shift()
-    message.content += nextChar
-    this.scrollToBottom()
-
-    setTimeout(() => this.playTypewriter(message), 10) // 10ms per character
-  }
-
-  private scrollToBottom(): void {
-    setTimeout(() => {
-      this.scrollAnchor?.nativeElement?.scrollIntoView({ behavior: 'smooth' })
-    }, 50)
-  }
-
-  public onOpenChange(open: boolean): void {
-    if (open) {
-      setTimeout(() => {
-        this.chatInput.nativeElement.focus()
-      }, 10)
-    }
-  }
-
-  public searchInputKeyDown(event: KeyboardEvent) {
-    if (event.key === 'Enter') {
-      event.preventDefault()
-      this.sendMessage()
-    }
-  }
-}

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

@@ -1,7 +1,7 @@
-<div ngbDropdown #fieldDropdown="ngbDropdown" (openChange)="onOpenClose($event)" [popperOptions]="popperOptions">
-    <button type="button" class="btn btn-sm btn-outline-primary" id="customFieldsDropdown" [disabled]="disabled" ngbDropdownToggle>
+<div ngbDropdown #fieldDropdown="ngbDropdown" (openChange)="onOpenClose($event)" [popperOptions]="popperOptions" placement="bottom-end">
+    <button class="btn btn-sm btn-outline-primary" id="customFieldsDropdown" [disabled]="disabled" ngbDropdownToggle>
       <i-bs name="ui-radios"></i-bs>
-      <div class="d-none d-lg-inline">&nbsp;<ng-container i18n>Custom Fields</ng-container></div>
+      <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Custom Fields</ng-container></div>
     </button>
     <div ngbDropdownMenu aria-labelledby="customFieldsDropdown" class="shadow custom-fields-dropdown">
         <div class="list-group list-group-flush" (keydown)="listKeyDown($event)">

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

@@ -1,36 +1,28 @@
-@if (useDropdown) {
-  <div class="btn-group w-100" role="group" ngbDropdown #dropdown="ngbDropdown" (openChange)="onOpenChange($event)" [popperOptions]="popperOptions">
-    <button class="btn btn-sm btn-outline-primary" id="dropdown_toggle" ngbDropdownToggle [disabled]="disabled">
-      <i-bs name="{{icon}}"></i-bs>
-      <div class="d-none d-sm-inline">&nbsp;{{title}}</div>
-      @if (isActive) {
-        <pngx-clearable-badge [selected]="isActive" (cleared)="reset()"></pngx-clearable-badge>
+<div class="btn-group w-100" role="group" ngbDropdown #dropdown="ngbDropdown" (openChange)="onOpenChange($event)" [popperOptions]="popperOptions">
+  <button class="btn btn-sm btn-outline-primary" id="dropdown_toggle" ngbDropdownToggle [disabled]="disabled">
+    <i-bs name="{{icon}}"></i-bs>
+    <div class="d-none d-sm-inline">&nbsp;{{title}}</div>
+    @if (isActive) {
+      <pngx-clearable-badge [selected]="isActive" (cleared)="reset()"></pngx-clearable-badge>
+    }
+  </button>
+  <div class="px-3 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown_{{name}}">
+    <div class="list-group list-group-flush">
+      @for (element of selectionModel.queries; track element.id; let i = $index) {
+        <div class="list-group-item px-0 d-flex flex-nowrap">
+          @switch (element.type) {
+            @case (CustomFieldQueryComponentType.Atom) {
+              <ng-container *ngTemplateOutlet="queryAtom; context: { atom: element }"></ng-container>
+            }
+            @case (CustomFieldQueryComponentType.Expression) {
+              <ng-container *ngTemplateOutlet="queryExpression; context: { expression: element }"></ng-container>
+            }
+          }
+        </div>
       }
-    </button>
-    <div class="px-3 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown_{{name}}">
-      <ng-container *ngTemplateOutlet="list; context: { queries: selectionModel.queries }"></ng-container>
     </div>
   </div>
-} @else {
-  <ng-container *ngTemplateOutlet="list; context: { queries: selectionModel.queries }"></ng-container>
-}
-
-<ng-template #list let-queries="queries">
-  <div class="list-group list-group-flush">
-    @for (element of queries; track element.id; let i = $index) {
-      <div class="list-group-item px-0 d-flex flex-nowrap">
-        @switch (element.type) {
-          @case (CustomFieldQueryComponentType.Atom) {
-            <ng-container *ngTemplateOutlet="queryAtom; context: { atom: element }"></ng-container>
-          }
-          @case (CustomFieldQueryComponentType.Expression) {
-            <ng-container *ngTemplateOutlet="queryExpression; context: { expression: element }"></ng-container>
-          }
-        }
-      </div>
-    }
-  </div>
-</ng-template>
+</div>
 
 <ng-template #comparisonValueTemplate let-atom="atom">
   @if (getCustomFieldByID(atom.field)?.data_type === CustomFieldDataType.Date) {

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

@@ -41,3 +41,9 @@
     min-width: 140px;
   }
 }
+
+.btn-group-xs {
+  > .btn {
+    border-radius: 0.15rem;
+  }
+}

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

@@ -120,12 +120,6 @@ export class CustomFieldQueriesModel {
     })
   }
 
-  addInitialAtom() {
-    this.addAtom(
-      new CustomFieldQueryAtom([null, CustomFieldQueryOperator.Exists, 'true'])
-    )
-  }
-
   private findElement(
     queryElement: CustomFieldQueryElement,
     elements: any[]
@@ -212,9 +206,6 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
   @Input()
   applyOnClose = false
 
-  @Input()
-  useDropdown: boolean = true
-
   get name(): string {
     return this.title ? this.title.replace(/\s/g, '_').toLowerCase() : null
   }
@@ -267,7 +258,13 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
   public onOpenChange(open: boolean) {
     if (open) {
       if (this.selectionModel.queries.length === 0) {
-        this.selectionModel.addInitialAtom()
+        this.selectionModel.addAtom(
+          new CustomFieldQueryAtom([
+            null,
+            CustomFieldQueryOperator.Exists,
+            'true',
+          ])
+        )
       }
       if (
         this.selectionModel.queries.length === 1 &&

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

@@ -177,16 +177,10 @@ export class CustomFieldEditDialogComponent
   }
 
   public removeSelectOption(index: number) {
-    const globalIndex =
-      index + (this.selectOptionsPage - 1) * SELECT_OPTION_PAGE_SIZE
-    this._allSelectOptions.splice(globalIndex, 1)
-
-    const totalPages = Math.max(
-      1,
-      Math.ceil(this._allSelectOptions.length / SELECT_OPTION_PAGE_SIZE)
+    this.selectOptions.removeAt(index)
+    this._allSelectOptions.splice(
+      index + (this.selectOptionsPage - 1) * SELECT_OPTION_PAGE_SIZE,
+      1
     )
-    const targetPage = Math.min(this.selectOptionsPage, totalPages)
-
-    this.selectOptionsPage = targetPage
   }
 }

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

@@ -156,97 +156,31 @@
     <p class="small" i18n>Trigger for documents that match <em>all</em> filters specified below.</p>
     <div class="row">
       <div class="col">
-        <pngx-input-text i18n-title title="Filter filename" formControlName="filter_filename" horizontal="true" i18n-hint hint="Apply to documents that match this filename. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." [error]="error?.filter_filename"></pngx-input-text>
+        <pngx-input-text i18n-title title="Filter filename" formControlName="filter_filename" i18n-hint hint="Apply to documents that match this filename. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." [error]="error?.filter_filename"></pngx-input-text>
         @if (formGroup.get('type').value === WorkflowTriggerType.Consumption) {
-          <pngx-input-select i18n-title title="Filter sources" [items]="sourceOptions" horizontal="true" [multiple]="true" formControlName="sources" [error]="error?.sources"></pngx-input-select>
-          <pngx-input-text i18n-title title="Filter path" formControlName="filter_path" horizontal="true" i18n-hint hint="Apply to documents that match this path. Wildcards specified as * are allowed. Case-normalized.</a>" [error]="error?.filter_path"></pngx-input-text>
-          <pngx-input-select i18n-title title="Filter mail rule" [items]="mailRules" horizontal="true" [allowNull]="true" formControlName="filter_mailrule" i18n-hint hint="Apply to documents consumed via this mail rule." [error]="error?.filter_mailrule"></pngx-input-select>
+          <pngx-input-select i18n-title title="Filter sources" [items]="sourceOptions" [multiple]="true" formControlName="sources" [error]="error?.sources"></pngx-input-select>
+          <pngx-input-text i18n-title title="Filter path" formControlName="filter_path" i18n-hint hint="Apply to documents that match this path. Wildcards specified as * are allowed. Case-normalized.</a>" [error]="error?.filter_path"></pngx-input-text>
+          <pngx-input-select i18n-title title="Filter mail rule" [items]="mailRules" [allowNull]="true" formControlName="filter_mailrule" i18n-hint hint="Apply to documents consumed via this mail rule." [error]="error?.filter_mailrule"></pngx-input-select>
         }
         @if (formGroup.get('type').value === WorkflowTriggerType.DocumentAdded || formGroup.get('type').value === WorkflowTriggerType.DocumentUpdated || formGroup.get('type').value === WorkflowTriggerType.Scheduled) {
-          <pngx-input-select i18n-title title="Content matching algorithm" horizontal="true" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>
-          @if (matchingPatternRequired(formGroup)) {
-            <pngx-input-text i18n-title title="Content matching pattern" horizontal="true" formControlName="match" [error]="error?.match"></pngx-input-text>
+          <pngx-input-select i18n-title title="Content matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>
+          @if (patternRequired) {
+            <pngx-input-text i18n-title title="Content matching pattern" formControlName="match" [error]="error?.match"></pngx-input-text>
           }
-          @if (matchingPatternRequired(formGroup)) {
-            <pngx-input-check i18n-title title="Case insensitive" horizontal="true" formControlName="is_insensitive"></pngx-input-check>
+          @if (patternRequired) {
+            <pngx-input-check i18n-title title="Case insensitive" formControlName="is_insensitive"></pngx-input-check>
           }
         }
       </div>
-    </div>
-    @if (formGroup.get('type').value === WorkflowTriggerType.DocumentAdded || formGroup.get('type').value === WorkflowTriggerType.DocumentUpdated || formGroup.get('type').value === WorkflowTriggerType.Scheduled) {
-      <div class="row mt-3">
-        <div class="col">
-          <div class="trigger-filters mb-3">
-            <div class="d-flex align-items-center">
-              <label class="form-label mb-0" i18n>Advanced Filters</label>
-              <button
-                type="button"
-                class="btn btn-sm btn-outline-primary ms-auto"
-                (click)="addFilter(formGroup)"
-                [disabled]="!canAddFilter(formGroup)"
-              >
-                <i-bs name="plus-circle"></i-bs>&nbsp;<span i18n>Add filter</span>
-              </button>
-            </div>
-            <ul class="mt-2 list-group filters" formArrayName="filters">
-              @if (getFiltersFormArray(formGroup).length === 0) {
-                <p class="text-muted small" i18n>No advanced workflow filters defined.</p>
-              }
-              @for (filter of getFiltersFormArray(formGroup).controls; track filter; let filterIndex = $index) {
-                <li [formGroupName]="filterIndex" class="list-group-item">
-                  <div class="d-flex align-items-center gap-2">
-                    <div class="w-25">
-                      <pngx-input-select
-                        i18n-title
-                        [items]="getFilterTypeOptions(formGroup, filterIndex)"
-                        formControlName="type"
-                        [allowNull]="false"
-                      ></pngx-input-select>
-                    </div>
-                    <div class="flex-grow-1">
-                      @if (isTagsFilter(filter.get('type').value)) {
-                        <pngx-input-tags
-                          [allowCreate]="false"
-                          [title]="null"
-                          formControlName="values"
-                        ></pngx-input-tags>
-                      } @else if (
-                        isCustomFieldQueryFilter(filter.get('type').value)
-                      ) {
-                        <pngx-custom-fields-query-dropdown
-                          [selectionModel]="getCustomFieldQueryModel(filter)"
-                          (selectionModelChange)="onCustomFieldQuerySelectionChange(filter, $event)"
-                          [useDropdown]="false"
-                        ></pngx-custom-fields-query-dropdown>
-                        @if (!isCustomFieldQueryValid(filter)) {
-                          <div class="text-danger small" i18n>
-                            Complete the custom field query configuration.
-                          </div>
-                        }
-                      } @else {
-                        <pngx-input-select
-                          [items]="getFilterSelectItems(filter.get('type').value)"
-                          [allowNull]="true"
-                          [multiple]="isSelectMultiple(filter.get('type').value)"
-                          formControlName="values"
-                        ></pngx-input-select>
-                      }
-                    </div>
-                    <button
-                      type="button"
-                      class="btn btn-link text-danger p-0"
-                      (click)="removeFilter(formGroup, filterIndex)"
-                    >
-                      <i-bs name="trash"></i-bs><span class="ms-1" i18n>Delete</span>
-                    </button>
-                  </div>
-                </li>
-              }
-            </ul>
-          </div>
+      @if (formGroup.get('type').value === WorkflowTriggerType.DocumentAdded || formGroup.get('type').value === WorkflowTriggerType.DocumentUpdated || formGroup.get('type').value === WorkflowTriggerType.Scheduled) {
+        <div class="col-md-6">
+          <pngx-input-tags [allowCreate]="false" i18n-title title="Has any of tags" formControlName="filter_has_tags"></pngx-input-tags>
+          <pngx-input-select i18n-title title="Has correspondent" [items]="correspondents" [allowNull]="true" formControlName="filter_has_correspondent"></pngx-input-select>
+          <pngx-input-select i18n-title title="Has document type" [items]="documentTypes" [allowNull]="true" formControlName="filter_has_document_type"></pngx-input-select>
+          <pngx-input-select i18n-title title="Has storage path" [items]="storagePaths" [allowNull]="true" formControlName="filter_has_storage_path"></pngx-input-select>
         </div>
-      </div>
-    }
+      }
+    </div>
   </div>
 </ng-template>
 

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

@@ -7,7 +7,3 @@
 .accordion-button {
     font-size: 1rem;
 }
-
-:host ::ng-deep .filters .paperless-input-select.mb-3 {
-    margin-bottom: 0 !important;
-}

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

@@ -11,14 +11,8 @@ import {
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
 import { of } from 'rxjs'
-import { CustomFieldQueriesModel } from 'src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component'
 import { CustomFieldDataType } from 'src/app/data/custom-field'
-import { CustomFieldQueryLogicalOperator } from 'src/app/data/custom-field-query'
-import {
-  MATCHING_ALGORITHMS,
-  MATCH_AUTO,
-  MATCH_NONE,
-} from 'src/app/data/matching-model'
+import { MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/matching-model'
 import { Workflow } from 'src/app/data/workflow'
 import {
   WorkflowAction,
@@ -37,7 +31,6 @@ import { DocumentTypeService } from 'src/app/services/rest/document-type.service
 import { MailRuleService } from 'src/app/services/rest/mail-rule.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { SettingsService } from 'src/app/services/settings.service'
-import { CustomFieldQueryExpression } from 'src/app/utils/custom-field-query-element'
 import { ConfirmButtonComponent } from '../../confirm-button/confirm-button.component'
 import { NumberComponent } from '../../input/number/number.component'
 import { PermissionsGroupComponent } from '../../input/permissions/permissions-group/permissions-group.component'
@@ -50,7 +43,6 @@ import { EditDialogMode } from '../edit-dialog.component'
 import {
   DOCUMENT_SOURCE_OPTIONS,
   SCHEDULE_DATE_FIELD_OPTIONS,
-  TriggerFilterType,
   WORKFLOW_ACTION_OPTIONS,
   WORKFLOW_TYPE_OPTIONS,
   WorkflowEditDialogComponent,
@@ -383,562 +375,6 @@ describe('WorkflowEditDialogComponent', () => {
     expect(component.objectForm.get('actions').value[0].webhook).toBeNull()
   })
 
-  it('should require matching pattern when algorithm is not none', () => {
-    const triggerGroup = new FormGroup({
-      matching_algorithm: new FormControl(MATCH_AUTO),
-      match: new FormControl(''),
-    })
-    expect(component.matchingPatternRequired(triggerGroup)).toBe(true)
-    triggerGroup.get('matching_algorithm').setValue(MATCHING_ALGORITHMS[0].id)
-    expect(component.matchingPatternRequired(triggerGroup)).toBe(true)
-    triggerGroup.get('matching_algorithm').setValue(MATCH_NONE)
-    expect(component.matchingPatternRequired(triggerGroup)).toBe(false)
-  })
-
-  it('should map filter builder values into trigger filters on save', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0)
-    component.addFilter(triggerGroup as FormGroup)
-    component.addFilter(triggerGroup as FormGroup)
-    component.addFilter(triggerGroup as FormGroup)
-
-    const filters = component.getFiltersFormArray(triggerGroup as FormGroup)
-    expect(filters.length).toBe(3)
-
-    filters.at(0).get('values').setValue([1])
-    filters.at(1).get('values').setValue([2, 3])
-    filters.at(2).get('values').setValue([4])
-
-    const addFilterOfType = (type: TriggerFilterType) => {
-      const newFilter = component.addFilter(triggerGroup as FormGroup)
-      newFilter.get('type').setValue(type)
-      return newFilter
-    }
-
-    const correspondentIs = addFilterOfType(TriggerFilterType.CorrespondentIs)
-    correspondentIs.get('values').setValue(1)
-
-    const correspondentNot = addFilterOfType(TriggerFilterType.CorrespondentNot)
-    correspondentNot.get('values').setValue([1])
-
-    const documentTypeIs = addFilterOfType(TriggerFilterType.DocumentTypeIs)
-    documentTypeIs.get('values').setValue(1)
-
-    const documentTypeNot = addFilterOfType(TriggerFilterType.DocumentTypeNot)
-    documentTypeNot.get('values').setValue([1])
-
-    const storagePathIs = addFilterOfType(TriggerFilterType.StoragePathIs)
-    storagePathIs.get('values').setValue(1)
-
-    const storagePathNot = addFilterOfType(TriggerFilterType.StoragePathNot)
-    storagePathNot.get('values').setValue([1])
-
-    const customFieldFilter = addFilterOfType(
-      TriggerFilterType.CustomFieldQuery
-    )
-    const customFieldQuery = JSON.stringify(['AND', [[1, 'exact', 'test']]])
-    customFieldFilter.get('values').setValue(customFieldQuery)
-
-    const formValues = component['getFormValues']()
-
-    expect(formValues.triggers[0].filter_has_tags).toEqual([1])
-    expect(formValues.triggers[0].filter_has_all_tags).toEqual([2, 3])
-    expect(formValues.triggers[0].filter_has_not_tags).toEqual([4])
-    expect(formValues.triggers[0].filter_has_correspondent).toEqual(1)
-    expect(formValues.triggers[0].filter_has_not_correspondents).toEqual([1])
-    expect(formValues.triggers[0].filter_has_document_type).toEqual(1)
-    expect(formValues.triggers[0].filter_has_not_document_types).toEqual([1])
-    expect(formValues.triggers[0].filter_has_storage_path).toEqual(1)
-    expect(formValues.triggers[0].filter_has_not_storage_paths).toEqual([1])
-    expect(formValues.triggers[0].filter_custom_field_query).toEqual(
-      customFieldQuery
-    )
-    expect(formValues.triggers[0].filters).toBeUndefined()
-  })
-
-  it('should ignore empty and null filter values when mapping filters', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    const tagsFilter = component.addFilter(triggerGroup)
-    tagsFilter.get('type').setValue(TriggerFilterType.TagsAny)
-    tagsFilter.get('values').setValue([])
-
-    const correspondentFilter = component.addFilter(triggerGroup)
-    correspondentFilter.get('type').setValue(TriggerFilterType.CorrespondentIs)
-    correspondentFilter.get('values').setValue(null)
-
-    const formValues = component['getFormValues']()
-
-    expect(formValues.triggers[0].filter_has_tags).toEqual([])
-    expect(formValues.triggers[0].filter_has_correspondent).toBeNull()
-  })
-
-  it('should derive single select filters from array values', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    const addFilterOfType = (type: TriggerFilterType, value: any) => {
-      const filter = component.addFilter(triggerGroup)
-      filter.get('type').setValue(type)
-      filter.get('values').setValue(value)
-    }
-
-    addFilterOfType(TriggerFilterType.CorrespondentIs, [5])
-    addFilterOfType(TriggerFilterType.DocumentTypeIs, [6])
-    addFilterOfType(TriggerFilterType.StoragePathIs, [7])
-
-    const formValues = component['getFormValues']()
-
-    expect(formValues.triggers[0].filter_has_correspondent).toEqual(5)
-    expect(formValues.triggers[0].filter_has_document_type).toEqual(6)
-    expect(formValues.triggers[0].filter_has_storage_path).toEqual(7)
-  })
-
-  it('should convert multi-value filter values when aggregating filters', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    const setFilter = (type: TriggerFilterType, value: number): void => {
-      const filter = component.addFilter(triggerGroup) as FormGroup
-      filter.get('type').setValue(type)
-      filter.get('values').setValue(value)
-    }
-
-    setFilter(TriggerFilterType.TagsAll, 11)
-    setFilter(TriggerFilterType.TagsNone, 12)
-    setFilter(TriggerFilterType.CorrespondentNot, 13)
-    setFilter(TriggerFilterType.DocumentTypeNot, 14)
-    setFilter(TriggerFilterType.StoragePathNot, 15)
-
-    const formValues = component['getFormValues']()
-
-    expect(formValues.triggers[0].filter_has_all_tags).toEqual([11])
-    expect(formValues.triggers[0].filter_has_not_tags).toEqual([12])
-    expect(formValues.triggers[0].filter_has_not_correspondents).toEqual([13])
-    expect(formValues.triggers[0].filter_has_not_document_types).toEqual([14])
-    expect(formValues.triggers[0].filter_has_not_storage_paths).toEqual([15])
-  })
-
-  it('should reuse filter type options and update disabled state', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-    component.addFilter(triggerGroup)
-
-    const optionsFirst = component.getFilterTypeOptions(triggerGroup, 0)
-    const optionsSecond = component.getFilterTypeOptions(triggerGroup, 0)
-    expect(optionsFirst).toBe(optionsSecond)
-
-    // to force disabled flag
-    component.addFilter(triggerGroup)
-    const filterArray = component.getFiltersFormArray(triggerGroup)
-    const firstFilter = filterArray.at(0)
-    firstFilter.get('type').setValue(TriggerFilterType.CorrespondentIs)
-
-    component.addFilter(triggerGroup)
-    const updatedFilters = component.getFiltersFormArray(triggerGroup)
-    const secondFilter = updatedFilters.at(1)
-    const options = component.getFilterTypeOptions(triggerGroup, 1)
-    const correspondentIsOption = options.find(
-      (option) => option.id === TriggerFilterType.CorrespondentIs
-    )
-    expect(correspondentIsOption.disabled).toBe(true)
-
-    firstFilter.get('type').setValue(TriggerFilterType.DocumentTypeNot)
-    secondFilter.get('type').setValue(TriggerFilterType.TagsAll)
-    const postChangeOptions = component.getFilterTypeOptions(triggerGroup, 1)
-    const correspondentOptionAfter = postChangeOptions.find(
-      (option) => option.id === TriggerFilterType.CorrespondentIs
-    )
-    expect(correspondentOptionAfter.disabled).toBe(false)
-  })
-
-  it('should keep multi-entry filter options enabled and allow duplicates', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    component.filterDefinitions = [
-      {
-        id: TriggerFilterType.TagsAny,
-        name: 'Any tags',
-        inputType: 'tags',
-        allowMultipleEntries: true,
-        allowMultipleValues: true,
-      } as any,
-      {
-        id: TriggerFilterType.CorrespondentIs,
-        name: 'Correspondent is',
-        inputType: 'select',
-        allowMultipleEntries: false,
-        allowMultipleValues: false,
-        selectItems: 'correspondents',
-      } as any,
-    ]
-
-    const firstFilter = component.addFilter(triggerGroup)
-    firstFilter.get('type').setValue(TriggerFilterType.TagsAny)
-
-    const secondFilter = component.addFilter(triggerGroup)
-    expect(secondFilter).not.toBeNull()
-
-    const options = component.getFilterTypeOptions(triggerGroup, 1)
-    const multiEntryOption = options.find(
-      (option) => option.id === TriggerFilterType.TagsAny
-    )
-
-    expect(multiEntryOption.disabled).toBe(false)
-    expect(component.canAddFilter(triggerGroup)).toBe(true)
-  })
-
-  it('should return null when no filter definitions remain available', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    component.filterDefinitions = [
-      {
-        id: TriggerFilterType.TagsAny,
-        name: 'Any tags',
-        inputType: 'tags',
-        allowMultipleEntries: false,
-        allowMultipleValues: true,
-      } as any,
-      {
-        id: TriggerFilterType.CorrespondentIs,
-        name: 'Correspondent is',
-        inputType: 'select',
-        allowMultipleEntries: false,
-        allowMultipleValues: false,
-        selectItems: 'correspondents',
-      } as any,
-    ]
-
-    const firstFilter = component.addFilter(triggerGroup)
-    firstFilter.get('type').setValue(TriggerFilterType.TagsAny)
-    const secondFilter = component.addFilter(triggerGroup)
-    secondFilter.get('type').setValue(TriggerFilterType.CorrespondentIs)
-
-    expect(component.canAddFilter(triggerGroup)).toBe(false)
-    expect(component.addFilter(triggerGroup)).toBeNull()
-  })
-
-  it('should skip filter definitions without handlers when building form array', () => {
-    const originalDefinitions = component.filterDefinitions
-    component.filterDefinitions = [
-      {
-        id: 999,
-        name: 'Unsupported',
-        inputType: 'text',
-        allowMultipleEntries: false,
-        allowMultipleValues: false,
-      } as any,
-    ]
-
-    const trigger = {
-      filter_has_tags: [],
-      filter_has_all_tags: [],
-      filter_has_not_tags: [],
-      filter_has_not_correspondents: [],
-      filter_has_not_document_types: [],
-      filter_has_not_storage_paths: [],
-      filter_has_correspondent: null,
-      filter_has_document_type: null,
-      filter_has_storage_path: null,
-      filter_custom_field_query: null,
-    } as any
-
-    const filters = component['buildFiltersFormArray'](trigger)
-    expect(filters.length).toBe(0)
-
-    component.filterDefinitions = originalDefinitions
-  })
-
-  it('should return null when adding filter for unknown trigger form group', () => {
-    expect(component.addFilter(new FormGroup({}) as any)).toBeNull()
-  })
-
-  it('should ignore remove filter calls for unknown trigger form group', () => {
-    expect(() =>
-      component.removeFilter(new FormGroup({}) as any, 0)
-    ).not.toThrow()
-  })
-
-  it('should teardown custom field query model when removing a custom field filter', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    component.addFilter(triggerGroup)
-    const filters = component.getFiltersFormArray(triggerGroup)
-    const filterGroup = filters.at(0) as FormGroup
-    filterGroup.get('type').setValue(TriggerFilterType.CustomFieldQuery)
-
-    const model = component.getCustomFieldQueryModel(filterGroup)
-    expect(model).toBeDefined()
-    expect(
-      component['getStoredCustomFieldQueryModel'](filterGroup as any)
-    ).toBe(model)
-
-    component.removeFilter(triggerGroup, 0)
-    expect(
-      component['getStoredCustomFieldQueryModel'](filterGroup as any)
-    ).toBeNull()
-  })
-
-  it('should return readable filter names', () => {
-    expect(component.getFilterName(TriggerFilterType.TagsAny)).toBe(
-      'Has any of these tags'
-    )
-    expect(component.getFilterName(999 as any)).toBe('')
-  })
-
-  it('should build filter form array from existing trigger filters', () => {
-    const trigger = workflow.triggers[0]
-    trigger.filter_has_tags = [1]
-    trigger.filter_has_all_tags = [2, 3]
-    trigger.filter_has_not_tags = [4]
-    trigger.filter_has_correspondent = 5 as any
-    trigger.filter_has_not_correspondents = [6] as any
-    trigger.filter_has_document_type = 7 as any
-    trigger.filter_has_not_document_types = [8] as any
-    trigger.filter_has_storage_path = 9 as any
-    trigger.filter_has_not_storage_paths = [10] as any
-    trigger.filter_custom_field_query = JSON.stringify([
-      'AND',
-      [[1, 'exact', 'value']],
-    ]) as any
-
-    component.object = workflow
-    component.ngOnInit()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-    const filters = component.getFiltersFormArray(triggerGroup)
-    expect(filters.length).toBe(10)
-    const customFieldFilter = filters.at(9) as FormGroup
-    expect(customFieldFilter.get('type').value).toBe(
-      TriggerFilterType.CustomFieldQuery
-    )
-    const model = component.getCustomFieldQueryModel(customFieldFilter)
-    expect(model.isValid()).toBe(true)
-  })
-
-  it('should expose select metadata helpers', () => {
-    expect(component.isSelectMultiple(TriggerFilterType.CorrespondentNot)).toBe(
-      true
-    )
-    expect(component.isSelectMultiple(TriggerFilterType.CorrespondentIs)).toBe(
-      false
-    )
-
-    component.correspondents = [{ id: 1, name: 'C1' } as any]
-    component.documentTypes = [{ id: 2, name: 'DT' } as any]
-    component.storagePaths = [{ id: 3, name: 'SP' } as any]
-
-    expect(
-      component.getFilterSelectItems(TriggerFilterType.CorrespondentIs)
-    ).toEqual(component.correspondents)
-    expect(
-      component.getFilterSelectItems(TriggerFilterType.DocumentTypeIs)
-    ).toEqual(component.documentTypes)
-    expect(
-      component.getFilterSelectItems(TriggerFilterType.StoragePathIs)
-    ).toEqual(component.storagePaths)
-    expect(component.getFilterSelectItems(TriggerFilterType.TagsAll)).toEqual(
-      []
-    )
-
-    expect(
-      component.isCustomFieldQueryFilter(TriggerFilterType.CustomFieldQuery)
-    ).toBe(true)
-  })
-
-  it('should return empty select items when definition is missing', () => {
-    const originalDefinitions = component.filterDefinitions
-    component.filterDefinitions = []
-
-    expect(
-      component.getFilterSelectItems(TriggerFilterType.CorrespondentIs)
-    ).toEqual([])
-
-    component.filterDefinitions = originalDefinitions
-  })
-
-  it('should return empty select items when definition has unknown source', () => {
-    const originalDefinitions = component.filterDefinitions
-    component.filterDefinitions = [
-      {
-        id: TriggerFilterType.CorrespondentIs,
-        name: 'Correspondent is',
-        inputType: 'select',
-        allowMultipleEntries: false,
-        allowMultipleValues: false,
-        selectItems: 'unknown',
-      } as any,
-    ]
-
-    expect(
-      component.getFilterSelectItems(TriggerFilterType.CorrespondentIs)
-    ).toEqual([])
-
-    component.filterDefinitions = originalDefinitions
-  })
-
-  it('should handle custom field query selection change and validation states', () => {
-    const formGroup = new FormGroup({
-      values: new FormControl(null),
-    })
-    const model = new CustomFieldQueriesModel()
-
-    const changeSpy = jest.spyOn(
-      component as any,
-      'onCustomFieldQueryModelChanged'
-    )
-
-    component.onCustomFieldQuerySelectionChange(formGroup, model)
-    expect(changeSpy).toHaveBeenCalledWith(formGroup, model)
-
-    expect(component.isCustomFieldQueryValid(formGroup)).toBe(true)
-    component['setCustomFieldQueryModel'](formGroup as any, model as any)
-
-    const validSpy = jest.spyOn(model, 'isValid').mockReturnValue(false)
-    const emptySpy = jest.spyOn(model, 'isEmpty').mockReturnValue(false)
-    expect(component.isCustomFieldQueryValid(formGroup)).toBe(false)
-    expect(validSpy).toHaveBeenCalled()
-
-    validSpy.mockReturnValue(true)
-    emptySpy.mockReturnValue(true)
-    expect(component.isCustomFieldQueryValid(formGroup)).toBe(true)
-
-    emptySpy.mockReturnValue(false)
-    expect(component.isCustomFieldQueryValid(formGroup)).toBe(true)
-
-    component['clearCustomFieldQueryModel'](formGroup as any)
-  })
-
-  it('should recover from invalid custom field query json and update control on changes', () => {
-    const filterGroup = new FormGroup({
-      values: new FormControl('not-json'),
-    })
-
-    component['ensureCustomFieldQueryModel'](filterGroup, 'not-json')
-
-    const model = component['getStoredCustomFieldQueryModel'](
-      filterGroup as any
-    )
-    expect(model).toBeDefined()
-    expect(model.queries.length).toBeGreaterThan(0)
-
-    const valuesControl = filterGroup.get('values')
-    expect(valuesControl.value).toBeNull()
-
-    const expression = new CustomFieldQueryExpression([
-      CustomFieldQueryLogicalOperator.And,
-      [[1, 'exact', 'value']],
-    ])
-    model.queries = [expression]
-
-    jest.spyOn(model, 'isValid').mockReturnValue(true)
-    jest.spyOn(model, 'isEmpty').mockReturnValue(false)
-
-    model.changed.next(model)
-
-    expect(valuesControl.value).toEqual(JSON.stringify(expression.serialize()))
-
-    component['clearCustomFieldQueryModel'](filterGroup as any)
-  })
-
-  it('should handle custom field query model change edge cases', () => {
-    const groupWithoutControl = new FormGroup({})
-    const dummyModel = {
-      isValid: jest.fn().mockReturnValue(true),
-      isEmpty: jest.fn().mockReturnValue(false),
-    }
-
-    expect(() =>
-      component['onCustomFieldQueryModelChanged'](
-        groupWithoutControl as any,
-        dummyModel as any
-      )
-    ).not.toThrow()
-
-    const groupWithControl = new FormGroup({
-      values: new FormControl('initial'),
-    })
-    const emptyModel = {
-      isValid: jest.fn().mockReturnValue(true),
-      isEmpty: jest.fn().mockReturnValue(true),
-    }
-
-    component['onCustomFieldQueryModelChanged'](
-      groupWithControl as any,
-      emptyModel as any
-    )
-
-    expect(groupWithControl.get('values').value).toBeNull()
-  })
-
-  it('should normalize filter values for single and multi selects', () => {
-    expect(
-      component['normalizeFilterValue'](TriggerFilterType.TagsAny)
-    ).toEqual([])
-    expect(
-      component['normalizeFilterValue'](TriggerFilterType.TagsAny, 5)
-    ).toEqual([5])
-    expect(
-      component['normalizeFilterValue'](TriggerFilterType.TagsAny, [5, 6])
-    ).toEqual([5, 6])
-    expect(
-      component['normalizeFilterValue'](TriggerFilterType.CorrespondentIs, [7])
-    ).toEqual(7)
-    expect(
-      component['normalizeFilterValue'](TriggerFilterType.CorrespondentIs, 8)
-    ).toEqual(8)
-    const customFieldJson = JSON.stringify(['AND', [[1, 'exact', 'test']]])
-    expect(
-      component['normalizeFilterValue'](
-        TriggerFilterType.CustomFieldQuery,
-        customFieldJson
-      )
-    ).toEqual(customFieldJson)
-
-    const customFieldObject = ['AND', [[1, 'exact', 'other']]]
-    expect(
-      component['normalizeFilterValue'](
-        TriggerFilterType.CustomFieldQuery,
-        customFieldObject
-      )
-    ).toEqual(JSON.stringify(customFieldObject))
-
-    expect(
-      component['normalizeFilterValue'](
-        TriggerFilterType.CustomFieldQuery,
-        false
-      )
-    ).toBeNull()
-  })
-
-  it('should add and remove filter form groups', () => {
-    component['changeDetector'] = { detectChanges: jest.fn() } as any
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    component.addFilter(triggerGroup)
-
-    component.removeFilter(triggerGroup, 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).length).toBe(1)
-  })
-
   it('should remove selected custom field from the form group', () => {
     const formGroup = new FormGroup({
       assign_custom_fields: new FormControl([1, 2, 3]),

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

@@ -6,7 +6,6 @@ import {
 import { NgTemplateOutlet } from '@angular/common'
 import { Component, OnInit, inject } from '@angular/core'
 import {
-  AbstractControl,
   FormArray,
   FormControl,
   FormGroup,
@@ -15,7 +14,7 @@ import {
 } from '@angular/forms'
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { Subscription, first, takeUntil } from 'rxjs'
+import { first } from 'rxjs'
 import { Correspondent } from 'src/app/data/correspondent'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
 import { DocumentType } from 'src/app/data/document-type'
@@ -46,12 +45,7 @@ import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { WorkflowService } from 'src/app/services/rest/workflow.service'
 import { SettingsService } from 'src/app/services/settings.service'
-import { CustomFieldQueryExpression } from 'src/app/utils/custom-field-query-element'
 import { ConfirmButtonComponent } from '../../confirm-button/confirm-button.component'
-import {
-  CustomFieldQueriesModel,
-  CustomFieldsQueryDropdownComponent,
-} from '../../custom-fields-query-dropdown/custom-fields-query-dropdown.component'
 import { CheckComponent } from '../../input/check/check.component'
 import { CustomFieldsValuesComponent } from '../../input/custom-fields-values/custom-fields-values.component'
 import { EntriesComponent } from '../../input/entries/entries.component'
@@ -141,235 +135,10 @@ export const WORKFLOW_ACTION_OPTIONS = [
   },
 ]
 
-export enum TriggerFilterType {
-  TagsAny = 'tags_any',
-  TagsAll = 'tags_all',
-  TagsNone = 'tags_none',
-  CorrespondentIs = 'correspondent_is',
-  CorrespondentNot = 'correspondent_not',
-  DocumentTypeIs = 'document_type_is',
-  DocumentTypeNot = 'document_type_not',
-  StoragePathIs = 'storage_path_is',
-  StoragePathNot = 'storage_path_not',
-  CustomFieldQuery = 'custom_field_query',
-}
-
-interface TriggerFilterDefinition {
-  id: TriggerFilterType
-  name: string
-  inputType: 'tags' | 'select' | 'customFieldQuery'
-  allowMultipleEntries: boolean
-  allowMultipleValues: boolean
-  selectItems?: 'correspondents' | 'documentTypes' | 'storagePaths'
-  disabled?: boolean
-}
-
-type TriggerFilterOption = TriggerFilterDefinition & {
-  disabled?: boolean
-}
-
-type TriggerFilterAggregate = {
-  filter_has_tags: number[]
-  filter_has_all_tags: number[]
-  filter_has_not_tags: number[]
-  filter_has_not_correspondents: number[]
-  filter_has_not_document_types: number[]
-  filter_has_not_storage_paths: number[]
-  filter_has_correspondent: number | null
-  filter_has_document_type: number | null
-  filter_has_storage_path: number | null
-  filter_custom_field_query: string | null
-}
-
-interface FilterHandler {
-  apply: (aggregate: TriggerFilterAggregate, values: any) => void
-  extract: (trigger: WorkflowTrigger) => any
-  hasValue: (value: any) => boolean
-}
-
-const CUSTOM_FIELD_QUERY_MODEL_KEY = Symbol('customFieldQueryModel')
-const CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY = Symbol(
-  'customFieldQuerySubscription'
-)
-
-type CustomFieldFilterGroup = FormGroup & {
-  [CUSTOM_FIELD_QUERY_MODEL_KEY]?: CustomFieldQueriesModel
-  [CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY]?: Subscription
-}
-
-const TRIGGER_FILTER_DEFINITIONS: TriggerFilterDefinition[] = [
-  {
-    id: TriggerFilterType.TagsAny,
-    name: $localize`Has any of these tags`,
-    inputType: 'tags',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-  },
-  {
-    id: TriggerFilterType.TagsAll,
-    name: $localize`Has all of these tags`,
-    inputType: 'tags',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-  },
-  {
-    id: TriggerFilterType.TagsNone,
-    name: $localize`Does not have these tags`,
-    inputType: 'tags',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-  },
-  {
-    id: TriggerFilterType.CorrespondentIs,
-    name: $localize`Has correspondent`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: false,
-    selectItems: 'correspondents',
-  },
-  {
-    id: TriggerFilterType.CorrespondentNot,
-    name: $localize`Does not have correspondents`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'correspondents',
-  },
-  {
-    id: TriggerFilterType.DocumentTypeIs,
-    name: $localize`Has document type`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: false,
-    selectItems: 'documentTypes',
-  },
-  {
-    id: TriggerFilterType.DocumentTypeNot,
-    name: $localize`Does not have document types`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'documentTypes',
-  },
-  {
-    id: TriggerFilterType.StoragePathIs,
-    name: $localize`Has storage path`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: false,
-    selectItems: 'storagePaths',
-  },
-  {
-    id: TriggerFilterType.StoragePathNot,
-    name: $localize`Does not have storage paths`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'storagePaths',
-  },
-  {
-    id: TriggerFilterType.CustomFieldQuery,
-    name: $localize`Matches custom field query`,
-    inputType: 'customFieldQuery',
-    allowMultipleEntries: false,
-    allowMultipleValues: false,
-  },
-]
-
 const TRIGGER_MATCHING_ALGORITHMS = MATCHING_ALGORITHMS.filter(
   (a) => a.id !== MATCH_AUTO
 )
 
-const FILTER_HANDLERS: Record<TriggerFilterType, FilterHandler> = {
-  [TriggerFilterType.TagsAny]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_tags = Array.isArray(values) ? [...values] : [values]
-    },
-    extract: (trigger) => trigger.filter_has_tags,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
-  [TriggerFilterType.TagsAll]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_all_tags = Array.isArray(values)
-        ? [...values]
-        : [values]
-    },
-    extract: (trigger) => trigger.filter_has_all_tags,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
-  [TriggerFilterType.TagsNone]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_not_tags = Array.isArray(values)
-        ? [...values]
-        : [values]
-    },
-    extract: (trigger) => trigger.filter_has_not_tags,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
-  [TriggerFilterType.CorrespondentIs]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_correspondent = Array.isArray(values)
-        ? (values[0] ?? null)
-        : values
-    },
-    extract: (trigger) => trigger.filter_has_correspondent,
-    hasValue: (value) => value !== null && value !== undefined,
-  },
-  [TriggerFilterType.CorrespondentNot]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_not_correspondents = Array.isArray(values)
-        ? [...values]
-        : [values]
-    },
-    extract: (trigger) => trigger.filter_has_not_correspondents,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
-  [TriggerFilterType.DocumentTypeIs]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_document_type = Array.isArray(values)
-        ? (values[0] ?? null)
-        : values
-    },
-    extract: (trigger) => trigger.filter_has_document_type,
-    hasValue: (value) => value !== null && value !== undefined,
-  },
-  [TriggerFilterType.DocumentTypeNot]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_not_document_types = Array.isArray(values)
-        ? [...values]
-        : [values]
-    },
-    extract: (trigger) => trigger.filter_has_not_document_types,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
-  [TriggerFilterType.StoragePathIs]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_storage_path = Array.isArray(values)
-        ? (values[0] ?? null)
-        : values
-    },
-    extract: (trigger) => trigger.filter_has_storage_path,
-    hasValue: (value) => value !== null && value !== undefined,
-  },
-  [TriggerFilterType.StoragePathNot]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_not_storage_paths = Array.isArray(values)
-        ? [...values]
-        : [values]
-    },
-    extract: (trigger) => trigger.filter_has_not_storage_paths,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
-  [TriggerFilterType.CustomFieldQuery]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_custom_field_query = values as string
-    },
-    extract: (trigger) => trigger.filter_custom_field_query,
-    hasValue: (value) =>
-      typeof value === 'string' && value !== null && value.trim().length > 0,
-  },
-}
-
 @Component({
   selector: 'pngx-workflow-edit-dialog',
   templateUrl: './workflow-edit-dialog.component.html',
@@ -384,7 +153,6 @@ const FILTER_HANDLERS: Record<TriggerFilterType, FilterHandler> = {
     TextAreaComponent,
     TagsComponent,
     CustomFieldsValuesComponent,
-    CustomFieldsQueryDropdownComponent,
     PermissionsGroupComponent,
     PermissionsUserComponent,
     ConfirmButtonComponent,
@@ -402,8 +170,6 @@ export class WorkflowEditDialogComponent
 {
   public WorkflowTriggerType = WorkflowTriggerType
   public WorkflowActionType = WorkflowActionType
-  public TriggerFilterType = TriggerFilterType
-  public filterDefinitions = TRIGGER_FILTER_DEFINITIONS
 
   private correspondentService: CorrespondentService
   private documentTypeService: DocumentTypeService
@@ -423,11 +189,6 @@ export class WorkflowEditDialogComponent
 
   private allowedActionTypes = []
 
-  private readonly triggerFilterOptionsMap = new WeakMap<
-    FormArray,
-    TriggerFilterOption[]
-  >()
-
   constructor() {
     super()
     this.service = inject(WorkflowService)
@@ -629,416 +390,6 @@ export class WorkflowEditDialogComponent
     return this.objectForm.get('actions') as FormArray
   }
 
-  protected override getFormValues(): any {
-    const formValues = super.getFormValues()
-
-    if (formValues?.triggers?.length) {
-      formValues.triggers = formValues.triggers.map(
-        (trigger: any, index: number) => {
-          const triggerFormGroup = this.triggerFields.at(index) as FormGroup
-          const filters = this.getFiltersFormArray(triggerFormGroup)
-
-          const aggregate: TriggerFilterAggregate = {
-            filter_has_tags: [],
-            filter_has_all_tags: [],
-            filter_has_not_tags: [],
-            filter_has_not_correspondents: [],
-            filter_has_not_document_types: [],
-            filter_has_not_storage_paths: [],
-            filter_has_correspondent: null,
-            filter_has_document_type: null,
-            filter_has_storage_path: null,
-            filter_custom_field_query: null,
-          }
-
-          for (const control of filters.controls) {
-            const type = control.get('type').value as TriggerFilterType
-            const values = control.get('values').value
-
-            if (values === null || values === undefined) {
-              continue
-            }
-
-            if (Array.isArray(values) && values.length === 0) {
-              continue
-            }
-
-            const handler = FILTER_HANDLERS[type]
-            handler?.apply(aggregate, values)
-          }
-
-          trigger.filter_has_tags = aggregate.filter_has_tags
-          trigger.filter_has_all_tags = aggregate.filter_has_all_tags
-          trigger.filter_has_not_tags = aggregate.filter_has_not_tags
-          trigger.filter_has_not_correspondents =
-            aggregate.filter_has_not_correspondents
-          trigger.filter_has_not_document_types =
-            aggregate.filter_has_not_document_types
-          trigger.filter_has_not_storage_paths =
-            aggregate.filter_has_not_storage_paths
-          trigger.filter_has_correspondent =
-            aggregate.filter_has_correspondent ?? null
-          trigger.filter_has_document_type =
-            aggregate.filter_has_document_type ?? null
-          trigger.filter_has_storage_path =
-            aggregate.filter_has_storage_path ?? null
-          trigger.filter_custom_field_query =
-            aggregate.filter_custom_field_query ?? null
-
-          delete trigger.filters
-
-          return trigger
-        }
-      )
-    }
-
-    return formValues
-  }
-
-  public matchingPatternRequired(formGroup: FormGroup): boolean {
-    return formGroup.get('matching_algorithm').value !== MATCH_NONE
-  }
-
-  private createFilterFormGroup(
-    type: TriggerFilterType,
-    initialValue?: any
-  ): FormGroup {
-    const group = new FormGroup({
-      type: new FormControl(type),
-      values: new FormControl(this.normalizeFilterValue(type, initialValue)),
-    })
-
-    group.get('type').valueChanges.subscribe((newType: TriggerFilterType) => {
-      if (newType === TriggerFilterType.CustomFieldQuery) {
-        this.ensureCustomFieldQueryModel(group)
-      } else {
-        this.clearCustomFieldQueryModel(group)
-        group.get('values').setValue(this.getDefaultFilterValue(newType), {
-          emitEvent: false,
-        })
-      }
-    })
-
-    if (type === TriggerFilterType.CustomFieldQuery) {
-      this.ensureCustomFieldQueryModel(group, initialValue)
-    }
-
-    return group
-  }
-
-  private buildFiltersFormArray(trigger: WorkflowTrigger): FormArray {
-    const filters = new FormArray([])
-
-    for (const definition of this.filterDefinitions) {
-      const handler = FILTER_HANDLERS[definition.id]
-      if (!handler) {
-        continue
-      }
-
-      const value = handler.extract(trigger)
-      if (!handler.hasValue(value)) {
-        continue
-      }
-
-      filters.push(this.createFilterFormGroup(definition.id, value))
-    }
-
-    return filters
-  }
-
-  getFiltersFormArray(formGroup: FormGroup): FormArray {
-    return formGroup.get('filters') as FormArray
-  }
-
-  getFilterTypeOptions(formGroup: FormGroup, filterIndex: number) {
-    const filters = this.getFiltersFormArray(formGroup)
-    const options = this.getFilterTypeOptionsForArray(filters)
-    const currentType = filters.at(filterIndex).get('type')
-      .value as TriggerFilterType
-    const usedTypes = new Set(
-      filters.controls.map(
-        (control) => control.get('type').value as TriggerFilterType
-      )
-    )
-
-    for (const option of options) {
-      if (option.allowMultipleEntries) {
-        option.disabled = false
-        continue
-      }
-
-      option.disabled = usedTypes.has(option.id) && option.id !== currentType
-    }
-
-    return options
-  }
-
-  canAddFilter(formGroup: FormGroup): boolean {
-    const filters = this.getFiltersFormArray(formGroup)
-    const usedTypes = new Set(
-      filters.controls.map(
-        (control) => control.get('type').value as TriggerFilterType
-      )
-    )
-
-    return this.filterDefinitions.some((definition) => {
-      if (definition.allowMultipleEntries) {
-        return true
-      }
-      return !usedTypes.has(definition.id)
-    })
-  }
-
-  addFilter(triggerFormGroup: FormGroup): FormGroup | null {
-    const triggerIndex = this.triggerFields.controls.indexOf(triggerFormGroup)
-    if (triggerIndex === -1) {
-      return null
-    }
-
-    const filters = this.getFiltersFormArray(triggerFormGroup)
-
-    const availableDefinition = this.filterDefinitions.find((definition) => {
-      if (definition.allowMultipleEntries) {
-        return true
-      }
-      return !filters.controls.some(
-        (control) => control.get('type').value === definition.id
-      )
-    })
-
-    if (!availableDefinition) {
-      return null
-    }
-
-    filters.push(this.createFilterFormGroup(availableDefinition.id))
-    triggerFormGroup.markAsDirty()
-    triggerFormGroup.markAsTouched()
-
-    return filters.at(-1) as FormGroup
-  }
-
-  removeFilter(triggerFormGroup: FormGroup, filterIndex: number) {
-    const triggerIndex = this.triggerFields.controls.indexOf(triggerFormGroup)
-    if (triggerIndex === -1) {
-      return
-    }
-
-    const filters = this.getFiltersFormArray(triggerFormGroup)
-    const filterGroup = filters.at(filterIndex) as FormGroup
-    if (filterGroup?.get('type').value === TriggerFilterType.CustomFieldQuery) {
-      this.clearCustomFieldQueryModel(filterGroup)
-    }
-    filters.removeAt(filterIndex)
-    triggerFormGroup.markAsDirty()
-    triggerFormGroup.markAsTouched()
-  }
-
-  getFilterDefinition(
-    type: TriggerFilterType
-  ): TriggerFilterDefinition | undefined {
-    return this.filterDefinitions.find((definition) => definition.id === type)
-  }
-
-  getFilterName(type: TriggerFilterType): string {
-    return this.getFilterDefinition(type)?.name ?? ''
-  }
-
-  isTagsFilter(type: TriggerFilterType): boolean {
-    return this.getFilterDefinition(type)?.inputType === 'tags'
-  }
-
-  isCustomFieldQueryFilter(type: TriggerFilterType): boolean {
-    return this.getFilterDefinition(type)?.inputType === 'customFieldQuery'
-  }
-
-  isMultiValueFilter(type: TriggerFilterType): boolean {
-    switch (type) {
-      case TriggerFilterType.TagsAny:
-      case TriggerFilterType.TagsAll:
-      case TriggerFilterType.TagsNone:
-      case TriggerFilterType.CorrespondentNot:
-      case TriggerFilterType.DocumentTypeNot:
-      case TriggerFilterType.StoragePathNot:
-        return true
-      default:
-        return false
-    }
-  }
-
-  isSelectMultiple(type: TriggerFilterType): boolean {
-    return !this.isTagsFilter(type) && this.isMultiValueFilter(type)
-  }
-
-  getFilterSelectItems(type: TriggerFilterType) {
-    const definition = this.getFilterDefinition(type)
-    if (!definition || definition.inputType !== 'select') {
-      return []
-    }
-
-    switch (definition.selectItems) {
-      case 'correspondents':
-        return this.correspondents
-      case 'documentTypes':
-        return this.documentTypes
-      case 'storagePaths':
-        return this.storagePaths
-      default:
-        return []
-    }
-  }
-
-  getCustomFieldQueryModel(control: AbstractControl): CustomFieldQueriesModel {
-    return this.ensureCustomFieldQueryModel(control as FormGroup)
-  }
-
-  onCustomFieldQuerySelectionChange(
-    control: AbstractControl,
-    model: CustomFieldQueriesModel
-  ) {
-    this.onCustomFieldQueryModelChanged(control as FormGroup, model)
-  }
-
-  isCustomFieldQueryValid(control: AbstractControl): boolean {
-    const model = this.getStoredCustomFieldQueryModel(control as FormGroup)
-    if (!model) {
-      return true
-    }
-
-    return model.isEmpty() || model.isValid()
-  }
-
-  private getFilterTypeOptionsForArray(
-    filters: FormArray
-  ): TriggerFilterOption[] {
-    let cached = this.triggerFilterOptionsMap.get(filters)
-    if (!cached) {
-      cached = this.filterDefinitions.map((definition) => ({
-        ...definition,
-        disabled: false,
-      }))
-      this.triggerFilterOptionsMap.set(filters, cached)
-    }
-    return cached
-  }
-
-  private ensureCustomFieldQueryModel(
-    filterGroup: FormGroup,
-    initialValue?: any
-  ): CustomFieldQueriesModel {
-    const existingModel = this.getStoredCustomFieldQueryModel(filterGroup)
-    if (existingModel) {
-      return existingModel
-    }
-
-    const model = new CustomFieldQueriesModel()
-    this.setCustomFieldQueryModel(filterGroup, model)
-
-    const rawValue =
-      typeof initialValue === 'string'
-        ? initialValue
-        : (filterGroup.get('values').value as string)
-
-    if (rawValue) {
-      try {
-        const parsed = JSON.parse(rawValue)
-        const expression = new CustomFieldQueryExpression(parsed)
-        model.queries = [expression]
-      } catch {
-        model.clear(false)
-        model.addInitialAtom()
-      }
-    }
-
-    const subscription = model.changed
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => {
-        this.onCustomFieldQueryModelChanged(filterGroup, model)
-      })
-    filterGroup[CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY]?.unsubscribe()
-    filterGroup[CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY] = subscription
-
-    this.onCustomFieldQueryModelChanged(filterGroup, model)
-
-    return model
-  }
-
-  private clearCustomFieldQueryModel(filterGroup: FormGroup) {
-    const group = filterGroup as CustomFieldFilterGroup
-    group[CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY]?.unsubscribe()
-    delete group[CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY]
-    delete group[CUSTOM_FIELD_QUERY_MODEL_KEY]
-  }
-
-  private getStoredCustomFieldQueryModel(
-    filterGroup: FormGroup
-  ): CustomFieldQueriesModel | null {
-    return (
-      (filterGroup as CustomFieldFilterGroup)[CUSTOM_FIELD_QUERY_MODEL_KEY] ??
-      null
-    )
-  }
-
-  private setCustomFieldQueryModel(
-    filterGroup: FormGroup,
-    model: CustomFieldQueriesModel
-  ) {
-    const group = filterGroup as CustomFieldFilterGroup
-    group[CUSTOM_FIELD_QUERY_MODEL_KEY] = model
-  }
-
-  private onCustomFieldQueryModelChanged(
-    filterGroup: FormGroup,
-    model: CustomFieldQueriesModel
-  ) {
-    const control = filterGroup.get('values')
-    if (!control) {
-      return
-    }
-
-    if (!model.isValid()) {
-      control.setValue(null, { emitEvent: false })
-      return
-    }
-
-    if (model.isEmpty()) {
-      control.setValue(null, { emitEvent: false })
-      return
-    }
-
-    const serialized = JSON.stringify(model.queries[0].serialize())
-    control.setValue(serialized, { emitEvent: false })
-  }
-
-  private getDefaultFilterValue(type: TriggerFilterType) {
-    if (type === TriggerFilterType.CustomFieldQuery) {
-      return null
-    }
-    return this.isMultiValueFilter(type) ? [] : null
-  }
-
-  private normalizeFilterValue(type: TriggerFilterType, value?: any) {
-    if (value === undefined || value === null) {
-      return this.getDefaultFilterValue(type)
-    }
-
-    if (type === TriggerFilterType.CustomFieldQuery) {
-      if (typeof value === 'string') {
-        return value
-      }
-      return value ? JSON.stringify(value) : null
-    }
-
-    if (this.isMultiValueFilter(type)) {
-      return Array.isArray(value) ? [...value] : [value]
-    }
-
-    if (Array.isArray(value)) {
-      return value.length > 0 ? value[0] : null
-    }
-
-    return value
-  }
-
   private createTriggerField(
     trigger: WorkflowTrigger,
     emitEvent: boolean = false
@@ -1054,7 +405,16 @@ export class WorkflowEditDialogComponent
         matching_algorithm: new FormControl(trigger.matching_algorithm),
         match: new FormControl(trigger.match),
         is_insensitive: new FormControl(trigger.is_insensitive),
-        filters: this.buildFiltersFormArray(trigger),
+        filter_has_tags: new FormControl(trigger.filter_has_tags),
+        filter_has_correspondent: new FormControl(
+          trigger.filter_has_correspondent
+        ),
+        filter_has_document_type: new FormControl(
+          trigger.filter_has_document_type
+        ),
+        filter_has_storage_path: new FormControl(
+          trigger.filter_has_storage_path
+        ),
         schedule_offset_days: new FormControl(trigger.schedule_offset_days),
         schedule_is_recurring: new FormControl(trigger.schedule_is_recurring),
         schedule_recurring_interval_days: new FormControl(
@@ -1177,12 +537,6 @@ export class WorkflowEditDialogComponent
       filter_path: null,
       filter_mailrule: null,
       filter_has_tags: [],
-      filter_has_all_tags: [],
-      filter_has_not_tags: [],
-      filter_has_not_correspondents: [],
-      filter_has_not_document_types: [],
-      filter_has_not_storage_paths: [],
-      filter_custom_field_query: null,
       filter_has_correspondent: null,
       filter_has_document_type: null,
       filter_has_storage_path: null,

src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.html

@@ -1,9 +1,5 @@
 <div class="modal-header">
-    <h4 class="modal-title" id="modal-basic-title" i18n>{
-      documentIds.length,
-      plural,
-      =1 {Email Document} other {Email {{documentIds.length}} Documents}
-    }</h4>
+    <h4 class="modal-title" id="modal-basic-title">{{title}}</h4>
     <button type="button" class="btn-close" aria-label="Close" (click)="close()"></button>
 </div>
 <div class="modal-body">
@@ -26,14 +22,11 @@
             <input class="form-check-input mt-0 me-2" type="checkbox" role="switch" id="useArchiveVersion" [disabled]="!hasArchiveVersion" [(ngModel)]="useArchiveVersion">
             <label class="form-check-label w-100 text-start" for="useArchiveVersion" i18n>Use archive version</label>
         </div>
-        <button type="submit" class="btn btn-outline-primary" (click)="emailDocuments()" [disabled]="loading || emailAddress.length === 0 || emailMessage.length === 0 || emailSubject.length === 0">
+        <button type="submit" class="btn btn-outline-primary" (click)="emailDocument()" [disabled]="loading || emailAddress.length === 0 || emailMessage.length === 0 || emailSubject.length === 0">
             @if (loading) {
                 <div class="spinner-border spinner-border-sm me-2" role="status"></div>
             }
             <ng-container i18n>Send email</ng-container>
         </button>
     </div>
-    <div class="text-light fst-italic small mt-2">
-        <ng-container i18n>Some email servers may reject messages with large attachments.</ng-container>
-    </div>
 </div>

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

@@ -36,59 +36,31 @@ describe('EmailDocumentDialogComponent', () => {
     documentService = TestBed.inject(DocumentService)
     toastService = TestBed.inject(ToastService)
     component = fixture.componentInstance
-    component.documentIds = [1]
     fixture.detectChanges()
   })
 
   it('should set hasArchiveVersion and useArchiveVersion', () => {
     expect(component.hasArchiveVersion).toBeTruthy()
-    expect(component.useArchiveVersion).toBeTruthy()
-
     component.hasArchiveVersion = false
     expect(component.hasArchiveVersion).toBeFalsy()
     expect(component.useArchiveVersion).toBeFalsy()
   })
 
-  it('should support sending single document via email, showing error if needed', () => {
+  it('should support sending document via email, showing error if needed', () => {
     const toastErrorSpy = jest.spyOn(toastService, 'showError')
     const toastSuccessSpy = jest.spyOn(toastService, 'showInfo')
-    component.documentIds = [1]
     component.emailAddress = 'hello@paperless-ngx.com'
     component.emailSubject = 'Hello'
     component.emailMessage = 'World'
     jest
-      .spyOn(documentService, 'emailDocuments')
+      .spyOn(documentService, 'emailDocument')
       .mockReturnValue(throwError(() => new Error('Unable to email document')))
-    component.emailDocuments()
-    expect(toastErrorSpy).toHaveBeenCalledWith(
-      'Error emailing document',
-      expect.any(Error)
-    )
+    component.emailDocument()
+    expect(toastErrorSpy).toHaveBeenCalled()
 
-    jest.spyOn(documentService, 'emailDocuments').mockReturnValue(of(true))
-    component.emailDocuments()
-    expect(toastSuccessSpy).toHaveBeenCalledWith('Email sent')
-  })
-
-  it('should support sending multiple documents via email, showing appropriate messages', () => {
-    const toastErrorSpy = jest.spyOn(toastService, 'showError')
-    const toastSuccessSpy = jest.spyOn(toastService, 'showInfo')
-    component.documentIds = [1, 2, 3]
-    component.emailAddress = 'hello@paperless-ngx.com'
-    component.emailSubject = 'Hello'
-    component.emailMessage = 'World'
-    jest
-      .spyOn(documentService, 'emailDocuments')
-      .mockReturnValue(throwError(() => new Error('Unable to email documents')))
-    component.emailDocuments()
-    expect(toastErrorSpy).toHaveBeenCalledWith(
-      'Error emailing documents',
-      expect.any(Error)
-    )
-
-    jest.spyOn(documentService, 'emailDocuments').mockReturnValue(of(true))
-    component.emailDocuments()
-    expect(toastSuccessSpy).toHaveBeenCalledWith('Email sent')
+    jest.spyOn(documentService, 'emailDocument').mockReturnValue(of(true))
+    component.emailDocument()
+    expect(toastSuccessSpy).toHaveBeenCalled()
   })
 
   it('should close the dialog', () => {

src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts

@@ -18,7 +18,10 @@ export class EmailDocumentDialogComponent extends LoadingComponentWithPermission
   private toastService = inject(ToastService)
 
   @Input()
-  documentIds: number[]
+  title = $localize`Email Document`
+
+  @Input()
+  documentId: number
 
   private _hasArchiveVersion: boolean = true
 
@@ -43,11 +46,11 @@ export class EmailDocumentDialogComponent extends LoadingComponentWithPermission
     this.loading = false
   }
 
-  public emailDocuments() {
+  public emailDocument() {
     this.loading = true
     this.documentService
-      .emailDocuments(
-        this.documentIds,
+      .emailDocument(
+        this.documentId,
         this.emailAddress,
         this.emailSubject,
         this.emailMessage,
@@ -64,11 +67,7 @@ export class EmailDocumentDialogComponent extends LoadingComponentWithPermission
         },
         error: (e) => {
           this.loading = false
-          const errorMessage =
-            this.documentIds.length > 1
-              ? $localize`Error emailing documents`
-              : $localize`Error emailing document`
-          this.toastService.showError(errorMessage, e)
+          this.toastService.showError($localize`Error emailing document`, e)
         },
       })
   }

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

@@ -1,18 +1,19 @@
 <div class="mb-3">
   @if (title) {
-    <label class="form-label" [for]="inputId">{{title}}</label>
+    <label [for]="inputId">{{title}}</label>
   }
 
   <div class="input-group" [class.is-invalid]="error">
-    <button type="button" class="input-group-text" [style.background-color]="value" (click)="colorPicker.toggle()">&nbsp;&nbsp;&nbsp;</button>
+    <span class="input-group-text" [style.background-color]="value">&nbsp;&nbsp;&nbsp;</span>
 
     <ng-template #popContent>
       <div style="min-width: 200px;" class="pb-3">
         <color-slider [color]="value" (onChangeComplete)="colorChanged($event.color.hex)"></color-slider>
       </div>
+
     </ng-template>
 
-    <input #inputField class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" [autoClose]="'outside'" [ngbPopover]="popContent" #colorPicker="ngbPopover" placement="bottom" popoverClass="shadow">
+    <input #inputField class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" [autoClose]="'outside'" [ngbPopover]="popContent" placement="bottom" popoverClass="shadow">
 
     <button class="btn btn-outline-secondary" type="button" (click)="randomize()">
       <i-bs name="dice5"></i-bs>

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

@@ -42,8 +42,8 @@ describe('ColorComponent', () => {
   })
 
   it('should set swatch color', () => {
-    const swatch: HTMLButtonElement = fixture.nativeElement.querySelector(
-      'button.input-group-text'
+    const swatch: HTMLSpanElement = fixture.nativeElement.querySelector(
+      'span.input-group-text'
     )
     expect(swatch.style.backgroundColor).toEqual('')
     component.value = '#ff0000'

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

@@ -14,7 +14,7 @@
     </div>
 </div>
 <div class="mt-2 align-items-center bg-light p-2">
-    <div class="d-flex flex-wrap flex-row gap-2 w-100" style="min-height: 1em;"
+    <div class="d-flex flex-wrap flex-row gap-2 w-100"
         cdkDropList #unselectedList="cdkDropList"
         cdkDropListOrientation="mixed"
         (cdkDropListDropped)="drop($event)"

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

@@ -1,24 +1,17 @@
-<div class="mb-3" [class.pb-3]="error">
-  <div class="row">
-    <div class="d-flex align-items-center position-relative hidden-button-container" [class.col-md-3]="horizontal">
-      @if (title) {
-        <label class="form-label" [class.mb-md-0]="horizontal" [for]="inputId">{{title}}</label>
-      }
-    </div>
-  <div class="position-relative" [class.col-md-9]="horizontal">
-    <div class="input-group" [class.is-invalid]="error">
-      <input #inputField [type]="showReveal && textVisible ? 'text' : 'password'" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (focus)="onFocus()" (focusout)="onFocusOut()" (change)="onChange(value)" [disabled]="disabled" [autocomplete]="autocomplete">
-      @if (showReveal) {
-        <button type="button" class="btn btn-outline-secondary" (click)="toggleVisibility()" i18n-title title="Show password" [disabled]="disabled || disableRevealToggle">
-          <i-bs name="eye"></i-bs>
-        </button>
-      }
-    </div>
-    <div class="invalid-feedback">
-      {{error}}
-    </div>
-    @if (hint) {
-      <small class="form-text text-muted" [innerHTML]="hint | safeHtml"></small>
+<div class="mb-3">
+  <label class="form-label" [for]="inputId">{{title}}</label>
+  <div class="input-group" [class.is-invalid]="error">
+    <input #inputField [type]="showReveal && textVisible ? 'text' : 'password'" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (focus)="onFocus()" (focusout)="onFocusOut()" (change)="onChange(value)" [disabled]="disabled" [autocomplete]="autocomplete">
+    @if (showReveal) {
+      <button type="button" class="btn btn-outline-secondary" (click)="toggleVisibility()" i18n-title title="Show password" [disabled]="disabled || disableRevealToggle">
+        <i-bs name="eye"></i-bs>
+      </button>
     }
   </div>
+  <div class="invalid-feedback">
+    {{error}}
+  </div>
+  @if (hint) {
+    <small class="form-text text-muted" [innerHTML]="hint | safeHtml"></small>
+  }
 </div>

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

@@ -1,68 +1,66 @@
 <div class="mb-3 paperless-input-select" [class.disabled]="disabled">
   <div class="row">
-    @if (title || removable) {
-      <div class="d-flex align-items-center position-relative hidden-button-container" [class.col-md-3]="horizontal">
-        @if (title) {
-          <label class="form-label" [class.mb-md-0]="horizontal" [for]="inputId">{{title}}</label>
+    <div class="d-flex align-items-center position-relative hidden-button-container" [class.col-md-3]="horizontal">
+      @if (title) {
+        <label class="form-label" [class.mb-md-0]="horizontal" [for]="inputId">{{title}}</label>
+      }
+      @if (removable) {
+        <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
+          <i-bs  name="x"></i-bs>&nbsp;<ng-container i18n>Remove</ng-container>
+          </button>
         }
-        @if (removable) {
-          <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-            <i-bs  name="x"></i-bs>&nbsp;<ng-container i18n>Remove</ng-container>
+      </div>
+      <div [class.col-md-9]="horizontal">
+        <div [class.input-group]="allowCreateNew || showFilter" [class.is-invalid]="error">
+          <ng-select name="inputId" [(ngModel)]="value"
+            [disabled]="disabled"
+            [style.color]="textColor"
+            [style.background]="backgroundColor"
+            [class.private]="isPrivate"
+            [clearable]="allowNull"
+            [items]="items"
+            [addTag]="allowCreateNew && addItemRef"
+            addTagText="Add item"
+            i18n-addTagText="Used for both types, correspondents, storage paths"
+            [placeholder]="placeholder"
+            [notFoundText]="notFoundText"
+            [multiple]="multiple"
+            [bindLabel]="bindLabel"
+            bindValue="id"
+            (change)="onChange(value)"
+            (search)="onSearch($event)"
+            (focus)="clearLastSearchTerm()"
+            (clear)="clearLastSearchTerm()"
+            (blur)="onBlur()">
+            <ng-template ng-option-tmp let-item="item">
+                <span [title]="item[bindLabel]">{{item[bindLabel]}}</span>
+            </ng-template>
+          </ng-select>
+          @if (allowCreateNew && !hideAddButton) {
+            <button class="btn btn-outline-secondary" type="button" (click)="addItem()" [disabled]="disabled">
+              <i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
             </button>
-        }
-      </div>
-    }
-    <div [class.col-md-9]="horizontal">
-      <div [class.input-group]="allowCreateNew || showFilter" [class.is-invalid]="error">
-        <ng-select name="inputId" [(ngModel)]="value"
-          [disabled]="disabled"
-          [style.color]="textColor"
-          [style.background]="backgroundColor"
-          [class.private]="isPrivate"
-          [clearable]="allowNull"
-          [items]="items"
-          [addTag]="allowCreateNew && addItemRef"
-          addTagText="Add item"
-          i18n-addTagText="Used for both types, correspondents, storage paths"
-          [placeholder]="placeholder"
-          [notFoundText]="notFoundText"
-          [multiple]="multiple"
-          [bindLabel]="bindLabel"
-          bindValue="id"
-          (change)="onChange(value)"
-          (search)="onSearch($event)"
-          (focus)="clearLastSearchTerm()"
-          (clear)="clearLastSearchTerm()"
-          (blur)="onBlur()">
-          <ng-template ng-option-tmp let-item="item">
-              <span [title]="item[bindLabel]">{{item[bindLabel]}}</span>
-          </ng-template>
-        </ng-select>
-        @if (allowCreateNew && !hideAddButton) {
-          <button class="btn btn-outline-secondary" type="button" (click)="addItem()" [disabled]="disabled">
-            <i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
-          </button>
-        }
-        @if (showFilter) {
-          <button class="btn btn-outline-secondary" type="button" (click)="onFilterDocuments()" [disabled]="isPrivate || this.value === null" title="{{ filterButtonTitle }}">
-            <i-bs width="1.2em" height="1.2em" name="filter"></i-bs>
-          </button>
-        }
-      </div>
-      <div class="invalid-feedback">
-        {{error}}
-      </div>
-      @if (hint) {
-        <small class="form-text text-muted">{{hint}}</small>
-      }
-      @if (getSuggestions().length > 0) {
-        <small>
-          <span i18n>Suggestions:</span>&nbsp;
-          @for (s of getSuggestions(); track s) {
-            <a (click)="value = s.id; onChange(value)" [routerLink]="[]">{{s.name}}</a>&nbsp;
           }
-        </small>
-      }
+          @if (showFilter) {
+            <button class="btn btn-outline-secondary" type="button" (click)="onFilterDocuments()" [disabled]="isPrivate || this.value === null" title="{{ filterButtonTitle }}">
+              <i-bs width="1.2em" height="1.2em" name="filter"></i-bs>
+            </button>
+          }
+        </div>
+        <div class="invalid-feedback">
+          {{error}}
+        </div>
+        @if (hint) {
+          <small class="form-text text-muted">{{hint}}</small>
+        }
+        @if (getSuggestions().length > 0) {
+          <small>
+            <span i18n>Suggestions:</span>&nbsp;
+            @for (s of getSuggestions(); track s) {
+              <a (click)="value = s.id; onChange(value)" [routerLink]="[]">{{s.name}}</a>&nbsp;
+            }
+          </small>
+        }
+      </div>
     </div>
   </div>
-</div>

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

@@ -1,10 +1,8 @@
 <div class="mb-3 paperless-input-select paperless-input-tags" [class.disabled]="disabled" [class.pb-3]="getSuggestions().length > 0">
   <div class="row">
-    @if (title) {
-      <div class="d-flex align-items-center" [class.col-md-3]="horizontal">
-        <label class="form-label" [class.mb-md-0]="horizontal" for="tags">{{title}}</label>
-      </div>
-    }
+    <div class="d-flex align-items-center" [class.col-md-3]="horizontal">
+      <label class="form-label" [class.mb-md-0]="horizontal" for="tags">{{title}}</label>
+    </div>
     <div class="position-relative" [class.col-md-9]="horizontal">
       <div class="input-group flex-nowrap">
         <ng-select #tagSelect name="tags" [items]="tags" bindLabel="name" bindValue="id" [(ngModel)]="value"

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

@@ -15,12 +15,6 @@
         @if (hint) {
           <small class="form-text text-muted" [innerHTML]="hint | safeHtml"></small>
         }
-        @if (getSuggestion()?.length > 0) {
-          <small>
-            <span i18n>Suggestion:</span>&nbsp;
-            <a (click)="applySuggestion(s)" [routerLink]="[]">{{getSuggestion()}}</a>&nbsp;
-          </small>
-        }
         <div class="invalid-feedback position-absolute top-100">
           {{error}}
         </div>

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

@@ -26,20 +26,10 @@ describe('TextComponent', () => {
 
   it('should support use of input field', () => {
     expect(component.value).toBeUndefined()
-    input.value = 'foo'
-    input.dispatchEvent(new Event('input'))
-    fixture.detectChanges()
-    expect(component.value).toBe('foo')
-  })
-
-  it('should support suggestion', () => {
-    component.value = 'foo'
-    component.suggestion = 'foo'
-    expect(component.getSuggestion()).toBe('')
-    component.value = 'bar'
-    expect(component.getSuggestion()).toBe('foo')
-    component.applySuggestion()
-    fixture.detectChanges()
-    expect(component.value).toBe('foo')
+    // TODO: why doesn't this work?
+    // input.value = 'foo'
+    // input.dispatchEvent(new Event('change'))
+    // fixture.detectChanges()
+    // expect(component.value).toEqual('foo')
   })
 })

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

@@ -4,7 +4,6 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { RouterLink } from '@angular/router'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
 import { AbstractInputComponent } from '../abstract-input'
@@ -25,7 +24,6 @@ import { AbstractInputComponent } from '../abstract-input'
     ReactiveFormsModule,
     SafeHtmlPipe,
     NgxBootstrapIconsModule,
-    RouterLink,
   ],
 })
 export class TextComponent extends AbstractInputComponent<string> {
@@ -35,19 +33,7 @@ export class TextComponent extends AbstractInputComponent<string> {
   @Input()
   placeholder: string = ''
 
-  @Input()
-  suggestion: string = ''
-
   constructor() {
     super()
   }
-
-  getSuggestion() {
-    return this.value !== this.suggestion ? this.suggestion : ''
-  }
-
-  applySuggestion() {
-    this.value = this.suggestion
-    this.onChange(this.value)
-  }
 }

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

@@ -1,49 +0,0 @@
-<div class="btn-group">
-  <button type="button" class="btn btn-sm btn-outline-primary" (click)="clickSuggest()" [disabled]="loading || (suggestions && !aiEnabled)">
-    @if (loading) {
-      <div class="spinner-border spinner-border-sm" role="status"></div>
-    } @else {
-      <i-bs width="1.2em" height="1.2em" name="stars"></i-bs>
-    }
-    <span class="d-none d-lg-inline ps-1" i18n>Suggest</span>
-    @if (totalSuggestions > 0) {
-      <span class="badge bg-primary ms-2">{{ totalSuggestions }}</span>
-    }
-  </button>
-
-  @if (aiEnabled) {
-    <div class="btn-group" ngbDropdown #dropdown="ngbDropdown" [popperOptions]="popperOptions">
-      <button type="button" class="btn btn-sm btn-outline-primary" ngbDropdownToggle [disabled]="loading || !suggestions" aria-expanded="false" aria-controls="suggestionsDropdown" aria-label="Suggestions dropdown">
-        <span class="visually-hidden" i18n>Show suggestions</span>
-      </button>
-
-      <div ngbDropdownMenu aria-labelledby="suggestionsDropdown" class="shadow suggestions-dropdown">
-        <div class="list-group list-group-flush small pb-0">
-          @if (!suggestions?.suggested_tags && !suggestions?.suggested_document_types && !suggestions?.suggested_correspondents) {
-            <div class="list-group-item text-muted fst-italic">
-              <small class="text-muted small fst-italic" i18n>No novel suggestions</small>
-            </div>
-          }
-          @if (suggestions?.suggested_tags.length > 0) {
-            <small class="list-group-item text-uppercase text-muted small">Tags</small>
-            @for (tag of suggestions.suggested_tags; track tag) {
-              <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addTag.emit(tag)" i18n>{{ tag }}</button>
-            }
-          }
-          @if (suggestions?.suggested_document_types.length > 0) {
-            <div class="list-group-item text-uppercase text-muted small">Document Types</div>
-            @for (type of suggestions.suggested_document_types; track type) {
-              <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addDocumentType.emit(type)" i18n>{{ type }}</button>
-            }
-          }
-          @if (suggestions?.suggested_correspondents.length > 0) {
-            <div class="list-group-item text-uppercase text-muted small">Correspondents</div>
-            @for (correspondent of suggestions.suggested_correspondents; track correspondent) {
-              <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addCorrespondent.emit(correspondent)" i18n>{{ correspondent }}</button>
-            }
-          }
-        </div>
-      </div>
-    </div>
-  }
-</div>

src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.scss

@@ -1,3 +0,0 @@
-.suggestions-dropdown {
-  min-width: 250px;
-}

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

@@ -1,51 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { SuggestionsDropdownComponent } from './suggestions-dropdown.component'
-
-describe('SuggestionsDropdownComponent', () => {
-  let component: SuggestionsDropdownComponent
-  let fixture: ComponentFixture<SuggestionsDropdownComponent>
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        NgbDropdownModule,
-        NgxBootstrapIconsModule.pick(allIcons),
-        SuggestionsDropdownComponent,
-      ],
-      providers: [],
-    })
-    fixture = TestBed.createComponent(SuggestionsDropdownComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  it('should calculate totalSuggestions', () => {
-    component.suggestions = {
-      suggested_correspondents: ['John Doe'],
-      suggested_tags: ['Tag1', 'Tag2'],
-      suggested_document_types: ['Type1'],
-    }
-    expect(component.totalSuggestions).toBe(4)
-  })
-
-  it('should emit getSuggestions when clickSuggest is called and suggestions are null', () => {
-    jest.spyOn(component.getSuggestions, 'emit')
-    component.suggestions = null
-    component.clickSuggest()
-    expect(component.getSuggestions.emit).toHaveBeenCalled()
-  })
-
-  it('should toggle dropdown when clickSuggest is called and suggestions are not null', () => {
-    component.aiEnabled = true
-    fixture.detectChanges()
-    component.suggestions = {
-      suggested_correspondents: [],
-      suggested_tags: [],
-      suggested_document_types: [],
-    }
-    component.clickSuggest()
-    expect(component.dropdown.open).toBeTruthy()
-  })
-})

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

@@ -1,64 +0,0 @@
-import {
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-  ViewChild,
-} from '@angular/core'
-import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { DocumentSuggestions } from 'src/app/data/document-suggestions'
-import { pngxPopperOptions } from 'src/app/utils/popper-options'
-
-@Component({
-  selector: 'pngx-suggestions-dropdown',
-  imports: [NgbDropdownModule, NgxBootstrapIconsModule],
-  templateUrl: './suggestions-dropdown.component.html',
-  styleUrl: './suggestions-dropdown.component.scss',
-})
-export class SuggestionsDropdownComponent {
-  public popperOptions = pngxPopperOptions
-
-  @ViewChild('dropdown') dropdown: NgbDropdown
-
-  @Input()
-  suggestions: DocumentSuggestions = null
-
-  @Input()
-  aiEnabled: boolean = false
-
-  @Input()
-  loading: boolean = false
-
-  @Input()
-  disabled: boolean = false
-
-  @Output()
-  getSuggestions: EventEmitter<SuggestionsDropdownComponent> =
-    new EventEmitter()
-
-  @Output()
-  addTag: EventEmitter<string> = new EventEmitter()
-
-  @Output()
-  addDocumentType: EventEmitter<string> = new EventEmitter()
-
-  @Output()
-  addCorrespondent: EventEmitter<string> = new EventEmitter()
-
-  public clickSuggest(): void {
-    if (!this.suggestions) {
-      this.getSuggestions.emit(this)
-    } else {
-      this.dropdown?.toggle()
-    }
-  }
-
-  get totalSuggestions(): number {
-    return (
-      this.suggestions?.suggested_correspondents?.length +
-        this.suggestions?.suggested_tags?.length +
-        this.suggestions?.suggested_document_types?.length || 0
-    )
-  }
-}

src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html

@@ -266,43 +266,6 @@
                   }
                 </span>
               </dd>
-              @if (aiEnabled) {
-                <dt i18n>AI Index</dt>
-                <dd class="d-flex align-items-center">
-                  <button class="btn btn-sm d-flex align-items-center btn-dark text-uppercase small" [ngbPopover]="llmIndexStatus" triggers="click mouseenter:mouseleave">
-                    {{status.tasks.llmindex_status}}
-                    @if (status.tasks.llmindex_status === 'OK') {
-                      @if (isStale(status.tasks.llmindex_last_modified)) {
-                        <i-bs name="exclamation-triangle-fill" class="text-warning ms-2 lh-1"></i-bs>
-                      } @else {
-                        <i-bs name="check-circle-fill" class="text-primary ms-2 lh-1"></i-bs>
-                      }
-                    } @else {
-                      <i-bs name="exclamation-triangle-fill" class="ms-2 lh-1"
-                      [class.text-danger]="status.tasks.llmindex_status === SystemStatusItemStatus.ERROR"
-                      [class.text-warning]="status.tasks.llmindex_status === SystemStatusItemStatus.WARNING"
-                      [class.text-muted]="status.tasks.llmindex_status === SystemStatusItemStatus.DISABLED"></i-bs>
-                    }
-                  </button>
-                  @if (currentUserIsSuperUser) {
-                    @if (isRunning(PaperlessTaskName.LLMIndexUpdate)) {
-                      <div class="spinner-border spinner-border-sm ms-2" role="status"></div>
-                    } @else {
-                      <button class="btn btn-sm d-flex align-items-center btn-dark small ms-2" (click)="runTask(PaperlessTaskName.LLMIndexUpdate)">
-                        <i-bs name="play-fill"></i-bs>&nbsp;
-                        <ng-container i18n>Run Task</ng-container>
-                      </button>
-                    }
-                  }
-                </dd>
-                <ng-template #llmIndexStatus>
-                  @if (status.tasks.llmindex_status === 'OK') {
-                    <h6><ng-container i18n>Last Run</ng-container>:</h6> <span class="font-monospace small">{{status.tasks.llmindex_last_modified | customDate:'medium'}}</span>
-                  } @else {
-                    <h6><ng-container i18n>Error</ng-container>:</h6> <span class="font-monospace small">{{status.tasks.llmindex_error}}</span>
-                  }
-                </ng-template>
-              }
             </dl>
           </div>
         </div>

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

@@ -68,9 +68,6 @@ const status: SystemStatus = {
     sanity_check_status: SystemStatusItemStatus.OK,
     sanity_check_last_run: new Date().toISOString(),
     sanity_check_error: null,
-    llmindex_status: SystemStatusItemStatus.OK,
-    llmindex_last_modified: new Date().toISOString(),
-    llmindex_error: null,
   },
 }
 

src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.ts

@@ -13,11 +13,9 @@ import {
   SystemStatus,
   SystemStatusItemStatus,
 } from 'src/app/data/system-status'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { FileSizePipe } from 'src/app/pipes/file-size.pipe'
 import { PermissionsService } from 'src/app/services/permissions.service'
-import { SettingsService } from 'src/app/services/settings.service'
 import { SystemStatusService } from 'src/app/services/system-status.service'
 import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -46,7 +44,6 @@ export class SystemStatusDialogComponent implements OnInit, OnDestroy {
   private toastService = inject(ToastService)
   private permissionsService = inject(PermissionsService)
   private websocketStatusService = inject(WebsocketStatusService)
-  private settingsService = inject(SettingsService)
 
   public SystemStatusItemStatus = SystemStatusItemStatus
   public PaperlessTaskName = PaperlessTaskName
@@ -63,10 +60,6 @@ export class SystemStatusDialogComponent implements OnInit, OnDestroy {
     return this.permissionsService.isSuperUser()
   }
 
-  get aiEnabled(): boolean {
-    return this.settingsService.get(SETTINGS_KEYS.AI_ENABLED)
-  }
-
   public ngOnInit() {
     this.versionMismatch =
       environment.production &&

src-ui/src/app/components/document-detail/document-detail.component.html

@@ -1,7 +1,30 @@
 <pngx-page-header [(title)]="title">
+
+  @if (document?.versions?.length > 0) {
+    <div class="btn-group" ngbDropdown role="group">
+      <div class="btn-group" ngbDropdown role="group">
+        <button class="btn btn-sm btn-outline-secondary dropdown-toggle" ngbDropdownToggle [disabled]="!hasVersions">
+          <i-bs name="layers"></i-bs>
+          <span class="d-none d-lg-inline ps-1" i18n>Version</span>
+        </button>
+        <div class="dropdown-menu shadow" ngbDropdownMenu>
+          @for (vid of document.versions; track vid) {
+            <button ngbDropdownItem (click)="selectVersion(vid)">
+              <span i18n>Version</span> {{vid}}
+              @if (selectedVersionId === vid) { <span>&nbsp;✓</span> }
+            </button>
+          }
+        </div>
+      </div>
+      <input #versionFileInput type="file" class="visually-hidden" (change)="onVersionFileSelected($event)" />
+      <button class="btn btn-sm btn-outline-secondary" title="Upload new version" i18n-title (click)="versionFileInput.click()" [disabled]="!userIsOwner || !userCanEdit">
+        <i-bs name="file-earmark-plus"></i-bs><span class="visually-hidden" i18n>Upload new version</span>
+      </button>
+    </div>
+  }
   @if (archiveContentRenderType === ContentRenderType.PDF && !useNativePdfViewer) {
     @if (previewNumPages) {
-      <div class="input-group input-group-sm d-none d-md-flex">
+      <div class="input-group input-group-sm ms-2 d-none d-md-flex">
         <div class="input-group-text" i18n>Page</div>
           <input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="previewCurrentPage" />
         <div class="input-group-text" i18n>of {{previewNumPages}}</div>
@@ -68,6 +91,16 @@
     </div>
   </div>
 
+  <pngx-custom-fields-dropdown
+    *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.CustomField }"
+    [documentId]="documentId"
+    [disabled]="!userCanEdit"
+    [existingFields]="document?.custom_fields"
+    (created)="refreshCustomFields()"
+    (added)="addField($event)">
+  </pngx-custom-fields-dropdown>
+
+
   <div class="ms-auto" ngbDropdown>
     <button class="btn btn-sm btn-outline-primary" id="sendDropdown" ngbDropdownToggle>
       <i-bs name="send"></i-bs>
@@ -88,7 +121,7 @@
 </pngx-page-header>
 
 <div class="row">
-  <div class="col-md-6 col-xl-5 mb-4">
+  <div class="col-md-6 col-xl-4 mb-4">
 
     <form [formGroup]='documentForm' (ngSubmit)="save()">
 
@@ -105,32 +138,6 @@
           </button>
         </div>
 
-        <ng-container *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }">
-          <div class="btn-group pb-3 ms-auto">
-            <pngx-suggestions-dropdown *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }"
-              [disabled]="!userCanEdit || suggestionsLoading"
-              [loading]="suggestionsLoading"
-              [suggestions]="suggestions"
-              [aiEnabled]="aiEnabled"
-              (getSuggestions)="getSuggestions()"
-              (addTag)="createTag($event)"
-              (addDocumentType)="createDocumentType($event)"
-              (addCorrespondent)="createCorrespondent($event)">
-            </pngx-suggestions-dropdown>
-          </div>
-
-          <div class="btn-group pb-3 ms-2">
-            <pngx-custom-fields-dropdown
-              *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.CustomField }"
-              [documentId]="documentId"
-              [disabled]="!userCanEdit"
-              [existingFields]="document?.custom_fields"
-              (created)="refreshCustomFields()"
-              (added)="addField($event)">
-            </pngx-custom-fields-dropdown>
-          </div>
-        </ng-container>
-
         <ng-container *ngTemplateOutlet="saveButtons"></ng-container>
       </div>
 
@@ -139,7 +146,7 @@
           <a ngbNavLink i18n>Details</a>
           <ng-template ngbNavContent>
             <div>
-              <pngx-input-text #inputTitle i18n-title title="Title" formControlName="title" [horizontal]="true" [suggestion]="suggestions?.title" (keyup)="titleKeyUp($event)" [error]="error?.title"></pngx-input-text>
+              <pngx-input-text #inputTitle i18n-title title="Title" formControlName="title" [horizontal]="true" (keyup)="titleKeyUp($event)" [error]="error?.title"></pngx-input-text>
               <pngx-input-number i18n-title title="Archive serial number" [error]="error?.archive_serial_number" [horizontal]="true" formControlName='archive_serial_number'></pngx-input-number>
               <pngx-input-date i18n-title title="Date created" formControlName="created" [suggestions]="suggestions?.dates" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event)"
               [error]="error?.created"></pngx-input-date>
@@ -149,7 +156,7 @@
               (createNew)="createDocumentType($event)" [hideAddButton]="createDisabled(DataType.DocumentType)" [suggestions]="suggestions?.document_types" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.DocumentType }"></pngx-input-select>
               <pngx-input-select [items]="storagePaths" i18n-title title="Storage path" formControlName="storage_path" [allowNull]="true" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.StoragePath)"
               (createNew)="createStoragePath($event)" [hideAddButton]="createDisabled(DataType.StoragePath)" [suggestions]="suggestions?.storage_paths" i18n-placeholder placeholder="Default" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.StoragePath }"></pngx-input-select>
-              <pngx-input-tags #tagsInput formControlName="tags" [suggestions]="suggestions?.tags" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.Tag)" [hideAddButton]="createDisabled(DataType.Tag)" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Tag }"></pngx-input-tags>
+              <pngx-input-tags formControlName="tags" [suggestions]="suggestions?.tags" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.Tag)" [hideAddButton]="createDisabled(DataType.Tag)" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Tag }"></pngx-input-tags>
               @for (fieldInstance of document?.custom_fields; track fieldInstance.field; let i = $index) {
                 <div [formGroup]="customFieldFormFields.controls[i]">
                   @switch (getCustomFieldFromInstance(fieldInstance)?.data_type) {
@@ -371,14 +378,14 @@
     </form>
   </div>
 
-  <div class="col-md-6 col-xl-7 mb-3 d-none d-md-block position-relative" #pdfPreview>
+  <div class="col-md-6 col-xl-8 mb-3 d-none d-md-block position-relative" #pdfPreview>
     <ng-container *ngTemplateOutlet="previewContent"></ng-container>
   </div>
 
 </div>
 
 <ng-template #saveButtons>
-  <div class="btn-group pb-3 ms-4">
+  <div class="btn-group pb-3 ms-auto">
     <ng-container *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }">
       <button type="submit" class="order-3 btn btn-sm btn-primary" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) !== true">Save</button>
       @if (hasNext()) {

src-ui/src/app/components/document-detail/document-detail.component.spec.ts

@@ -156,16 +156,6 @@ describe('DocumentDetailComponent', () => {
         {
           provide: TagService,
           useValue: {
-            getCachedMany: (ids: number[]) =>
-              of(
-                ids.map((id) => ({
-                  id,
-                  name: `Tag${id}`,
-                  is_inbox_tag: true,
-                  color: '#ff0000',
-                  text_color: '#000000',
-                }))
-              ),
             listAll: () =>
               of({
                 count: 3,
@@ -392,32 +382,8 @@ describe('DocumentDetailComponent', () => {
     currentUserCan = true
   })
 
-  it('should support creating tag, remove from suggestions', () => {
+  it('should support creating document type', () => {
     initNormally()
-    component.suggestions = {
-      suggested_tags: ['Tag1', 'NewTag12'],
-    }
-    let openModal: NgbModalRef
-    modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
-    const modalSpy = jest.spyOn(modalService, 'open')
-    component.createTag('NewTag12')
-    expect(modalSpy).toHaveBeenCalled()
-    openModal.componentInstance.succeeded.next({
-      id: 12,
-      name: 'NewTag12',
-      is_inbox_tag: true,
-      color: '#ff0000',
-      text_color: '#000000',
-    })
-    expect(component.tagsInput.value).toContain(12)
-    expect(component.suggestions.suggested_tags).not.toContain('NewTag12')
-  })
-
-  it('should support creating document type, remove from suggestions', () => {
-    initNormally()
-    component.suggestions = {
-      suggested_document_types: ['DocumentType1', 'NewDocType2'],
-    }
     let openModal: NgbModalRef
     modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
     const modalSpy = jest.spyOn(modalService, 'open')
@@ -425,16 +391,10 @@ describe('DocumentDetailComponent', () => {
     expect(modalSpy).toHaveBeenCalled()
     openModal.componentInstance.succeeded.next({ id: 12, name: 'NewDocType12' })
     expect(component.documentForm.get('document_type').value).toEqual(12)
-    expect(component.suggestions.suggested_document_types).not.toContain(
-      'NewDocType2'
-    )
   })
 
-  it('should support creating correspondent, remove from suggestions', () => {
+  it('should support creating correspondent', () => {
     initNormally()
-    component.suggestions = {
-      suggested_correspondents: ['Correspondent1', 'NewCorrrespondent12'],
-    }
     let openModal: NgbModalRef
     modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
     const modalSpy = jest.spyOn(modalService, 'open')
@@ -445,9 +405,6 @@ describe('DocumentDetailComponent', () => {
       name: 'NewCorrrespondent12',
     })
     expect(component.documentForm.get('correspondent').value).toEqual(12)
-    expect(component.suggestions.suggested_correspondents).not.toContain(
-      'NewCorrrespondent12'
-    )
   })
 
   it('should support creating storage path', () => {
@@ -1038,7 +995,7 @@ describe('DocumentDetailComponent', () => {
     expect(component.document.custom_fields).toHaveLength(initialLength - 1)
     expect(component.customFieldFormFields).toHaveLength(initialLength - 1)
     expect(
-      fixture.debugElement.query(By.css('form ul')).nativeElement.textContent
+      fixture.debugElement.query(By.css('form')).nativeElement.textContent
     ).not.toContain('Field 1')
     const patchSpy = jest.spyOn(documentService, 'patch')
     component.save(true)
@@ -1129,22 +1086,10 @@ describe('DocumentDetailComponent', () => {
 
   it('should get suggestions', () => {
     const suggestionsSpy = jest.spyOn(documentService, 'getSuggestions')
-    suggestionsSpy.mockReturnValue(
-      of({
-        tags: [42, 43],
-        suggested_tags: [],
-        suggested_document_types: [],
-        suggested_correspondents: [],
-      })
-    )
+    suggestionsSpy.mockReturnValue(of({ tags: [42, 43] }))
     initNormally()
     expect(suggestionsSpy).toHaveBeenCalled()
-    expect(component.suggestions).toEqual({
-      tags: [42, 43],
-      suggested_tags: [],
-      suggested_document_types: [],
-      suggested_correspondents: [],
-    })
+    expect(component.suggestions).toEqual({ tags: [42, 43] })
   })
 
   it('should show error if needed for get suggestions', () => {
@@ -1267,7 +1212,7 @@ describe('DocumentDetailComponent', () => {
   it('should support keyboard shortcuts', () => {
     initNormally()
 
-    const hasNextSpy = jest.spyOn(component, 'hasNext').mockReturnValue(true)
+    jest.spyOn(component, 'hasNext').mockReturnValue(true)
     const nextSpy = jest.spyOn(component, 'nextDoc')
     document.dispatchEvent(
       new KeyboardEvent('keydown', { key: 'arrowright', ctrlKey: true })
@@ -1281,32 +1226,21 @@ describe('DocumentDetailComponent', () => {
     )
     expect(prevSpy).toHaveBeenCalled()
 
-    const isDirtySpy = jest
-      .spyOn(openDocumentsService, 'isDirty')
-      .mockReturnValue(true)
+    jest.spyOn(openDocumentsService, 'isDirty').mockReturnValue(true)
     const saveSpy = jest.spyOn(component, 'save')
     document.dispatchEvent(
       new KeyboardEvent('keydown', { key: 's', ctrlKey: true })
     )
     expect(saveSpy).toHaveBeenCalled()
 
-    hasNextSpy.mockReturnValue(true)
+    jest.spyOn(openDocumentsService, 'isDirty').mockReturnValue(true)
+    jest.spyOn(component, 'hasNext').mockReturnValue(true)
     const saveNextSpy = jest.spyOn(component, 'saveEditNext')
     document.dispatchEvent(
       new KeyboardEvent('keydown', { key: 's', ctrlKey: true, shiftKey: true })
     )
     expect(saveNextSpy).toHaveBeenCalled()
 
-    saveSpy.mockClear()
-    saveNextSpy.mockClear()
-    isDirtySpy.mockReturnValue(true)
-    hasNextSpy.mockReturnValue(false)
-    document.dispatchEvent(
-      new KeyboardEvent('keydown', { key: 's', ctrlKey: true, shiftKey: true })
-    )
-    expect(saveNextSpy).not.toHaveBeenCalled()
-    expect(saveSpy).toHaveBeenCalledWith(true)
-
     const closeSpy = jest.spyOn(component, 'close')
     document.dispatchEvent(new KeyboardEvent('keydown', { key: 'escape' }))
     expect(closeSpy).toHaveBeenCalled()

src-ui/src/app/components/document-detail/document-detail.component.ts

@@ -31,7 +31,6 @@ import {
   map,
   switchMap,
   takeUntil,
-  tap,
 } from 'rxjs/operators'
 import { Correspondent } from 'src/app/data/correspondent'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
@@ -77,7 +76,6 @@ import { DocumentTypeService } from 'src/app/services/rest/document-type.service
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
-import { TagService } from 'src/app/services/rest/tag.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -90,7 +88,6 @@ import { CorrespondentEditDialogComponent } from '../common/edit-dialog/correspo
 import { DocumentTypeEditDialogComponent } from '../common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component'
 import { EditDialogMode } from '../common/edit-dialog/edit-dialog.component'
 import { StoragePathEditDialogComponent } from '../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component'
-import { TagEditDialogComponent } from '../common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component'
 import { EmailDocumentDialogComponent } from '../common/email-document-dialog/email-document-dialog.component'
 import { CheckComponent } from '../common/input/check/check.component'
 import { DateComponent } from '../common/input/date/date.component'
@@ -109,7 +106,6 @@ import {
   PdfEditorEditMode,
 } from '../common/pdf-editor/pdf-editor.component'
 import { ShareLinksDialogComponent } from '../common/share-links-dialog/share-links-dialog.component'
-import { SuggestionsDropdownComponent } from '../common/suggestions-dropdown/suggestions-dropdown.component'
 import { DocumentHistoryComponent } from '../document-history/document-history.component'
 import { DocumentNotesComponent } from '../document-notes/document-notes.component'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
@@ -166,7 +162,6 @@ export enum ZoomSetting {
     NumberComponent,
     MonetaryComponent,
     UrlComponent,
-    SuggestionsDropdownComponent,
     CustomDatePipe,
     FileSizePipe,
     IfPermissionsDirective,
@@ -188,7 +183,6 @@ export class DocumentDetailComponent
 {
   private documentsService = inject(DocumentService)
   private route = inject(ActivatedRoute)
-  private tagService = inject(TagService)
   private correspondentService = inject(CorrespondentService)
   private documentTypeService = inject(DocumentTypeService)
   private router = inject(Router)
@@ -211,8 +205,6 @@ export class DocumentDetailComponent
   @ViewChild('inputTitle')
   titleInput: TextComponent
 
-  @ViewChild('tagsInput') tagsInput: TagsComponent
-
   expandOriginalMetadata = false
   expandArchivedMetadata = false
 
@@ -224,13 +216,14 @@ export class DocumentDetailComponent
   document: Document
   metadata: DocumentMetadata
   suggestions: DocumentSuggestions
-  suggestionsLoading: boolean = false
   users: User[]
 
   title: string
   titleSubject: Subject<string> = new Subject()
   previewUrl: string
   thumbUrl: string
+  // Versioning: which document ID to use for file preview/download
+  selectedVersionId: number
   previewText: string
   previewLoaded: boolean = false
   tiffURL: string
@@ -279,6 +272,7 @@ export class DocumentDetailComponent
   public readonly DataType = DataType
 
   @ViewChild('nav') nav: NgbNav
+  @ViewChild('versionFileInput') versionFileInput
   @ViewChild('pdfPreview') set pdfPreview(element) {
     // this gets called when component added or removed from DOM
     if (
@@ -306,10 +300,6 @@ export class DocumentDetailComponent
     return this.deviceDetectorService.isMobile()
   }
 
-  get aiEnabled(): boolean {
-    return this.settings.get(SETTINGS_KEYS.AI_ENABLED)
-  }
-
   get archiveContentRenderType(): ContentRenderType {
     return this.document?.archived_file_name
       ? this.getRenderType('application/pdf')
@@ -415,7 +405,10 @@ export class DocumentDetailComponent
   }
 
   private loadDocument(documentId: number): void {
-    this.previewUrl = this.documentsService.getPreviewUrl(documentId)
+    this.selectedVersionId = documentId
+    this.previewUrl = this.documentsService.getPreviewUrl(
+      this.selectedVersionId
+    )
     this.http
       .get(this.previewUrl, { responseType: 'text' })
       .pipe(
@@ -430,7 +423,7 @@ export class DocumentDetailComponent
             err.message ?? err.toString()
           }`),
       })
-    this.thumbUrl = this.documentsService.getThumbUrl(documentId)
+    this.thumbUrl = this.documentsService.getThumbUrl(this.selectedVersionId)
     this.documentsService
       .get(documentId)
       .pipe(
@@ -628,10 +621,7 @@ export class DocumentDetailComponent
       })
       .pipe(takeUntil(this.unsubscribeNotifier))
       .subscribe(() => {
-        if (this.openDocumentService.isDirty(this.document)) {
-          if (this.hasNext()) this.saveEditNext()
-          else this.save(true)
-        }
+        if (this.openDocumentService.isDirty(this.document)) this.saveEditNext()
       })
   }
 
@@ -654,6 +644,10 @@ export class DocumentDetailComponent
 
   updateComponent(doc: Document) {
     this.document = doc
+    // Default selected version is the newest version
+    this.selectedVersionId = doc.versions?.length
+      ? Math.max(...doc.versions)
+      : doc.id
     this.requiresPassword = false
     this.updateFormForCustomFields()
     if (this.archiveContentRenderType === ContentRenderType.TIFF) {
@@ -694,76 +688,62 @@ export class DocumentDetailComponent
         PermissionType.Document
       )
     ) {
-      this.tagService.getCachedMany(doc.tags).subscribe((tags) => {
-        // only show suggestions if document has inbox tags
-        if (tags.some((tag) => tag.is_inbox_tag)) {
-          this.getSuggestions()
-        }
-      })
+      this.documentsService
+        .getSuggestions(doc.id)
+        .pipe(
+          first(),
+          takeUntil(this.unsubscribeNotifier),
+          takeUntil(this.docChangeNotifier)
+        )
+        .subscribe({
+          next: (result) => {
+            this.suggestions = result
+          },
+          error: (error) => {
+            this.suggestions = null
+            this.toastService.showError(
+              $localize`Error retrieving suggestions.`,
+              error
+            )
+          },
+        })
     }
     this.title = this.documentTitlePipe.transform(doc.title)
     this.prepareForm(doc)
   }
 
-  get customFieldFormFields(): FormArray {
-    return this.documentForm.get('custom_fields') as FormArray
+  get hasVersions(): boolean {
+    return this.document?.versions?.length > 1
   }
 
-  getSuggestions() {
-    this.suggestionsLoading = true
-    this.documentsService
-      .getSuggestions(this.documentId)
+  // Update file preview and download target to a specific version (by document id)
+  selectVersion(versionId: number) {
+    this.selectedVersionId = versionId
+    this.previewUrl = this.documentsService.getPreviewUrl(
+      this.documentId,
+      false,
+      this.selectedVersionId
+    )
+    this.thumbUrl = this.documentsService.getThumbUrl(this.selectedVersionId)
+    // For text previews, refresh content
+    this.http
+      .get(this.previewUrl, { responseType: 'text' })
       .pipe(
         first(),
         takeUntil(this.unsubscribeNotifier),
         takeUntil(this.docChangeNotifier)
       )
       .subscribe({
-        next: (result) => {
-          this.suggestions = result
-          this.suggestionsLoading = false
-        },
-        error: (error) => {
-          this.suggestions = null
-          this.suggestionsLoading = false
-          this.toastService.showError(
-            $localize`Error retrieving suggestions.`,
-            error
-          )
-        },
+        next: (res) => (this.previewText = res.toString()),
+        error: (err) =>
+          (this.previewText = $localize`An error occurred loading content: ${
+            err.message ?? err.toString()
+          }`),
       })
   }
 
-  createTag(newName: string) {
-    var modal = this.modalService.open(TagEditDialogComponent, {
-      backdrop: 'static',
-    })
-    modal.componentInstance.dialogMode = EditDialogMode.CREATE
-    if (newName) modal.componentInstance.object = { name: newName }
-    modal.componentInstance.succeeded
-      .pipe(
-        tap((newTag: Tag) => {
-          // remove from suggestions if present
-          if (this.suggestions) {
-            this.suggestions = {
-              ...this.suggestions,
-              suggested_tags: this.suggestions.suggested_tags.filter(
-                (tag) => tag !== newTag.name
-              ),
-            }
-          }
-        }),
-        switchMap((newTag: Tag) => {
-          return this.tagService
-            .listAll()
-            .pipe(map((tags) => ({ newTag, tags })))
-        }),
-        takeUntil(this.unsubscribeNotifier)
-      )
-      .subscribe(({ newTag, tags }) => {
-        this.tagsInput.tags = tags.results
-        this.tagsInput.addTag(newTag.id)
-      })
+  get customFieldFormFields(): FormArray {
+    return this.documentForm.get('custom_fields') as FormArray
   }
 
   createDocumentType(newName: string) {
@@ -785,12 +765,6 @@ export class DocumentDetailComponent
         this.documentTypes = documentTypes.results
         this.documentForm.get('document_type').setValue(newDocumentType.id)
         this.documentForm.get('document_type').markAsDirty()
-        if (this.suggestions) {
-          this.suggestions.suggested_document_types =
-            this.suggestions.suggested_document_types.filter(
-              (dt) => dt !== newName
-            )
-        }
       })
   }
 
@@ -815,12 +789,6 @@ export class DocumentDetailComponent
         this.correspondents = correspondents.results
         this.documentForm.get('correspondent').setValue(newCorrespondent.id)
         this.documentForm.get('correspondent').markAsDirty()
-        if (this.suggestions) {
-          this.suggestions.suggested_correspondents =
-            this.suggestions.suggested_correspondents.filter(
-              (c) => c !== newName
-            )
-        }
       })
   }
 
@@ -1121,10 +1089,36 @@ export class DocumentDetailComponent
     })
   }
 
+  onVersionFileSelected(event: Event) {
+    const input = event.target as HTMLInputElement
+    if (!input?.files || input.files.length === 0) return
+    const file = input.files[0]
+    // Reset input to allow re-selection of the same file later
+    input.value = ''
+    this.documentsService
+      .uploadVersion(this.documentId, file)
+      .pipe(first())
+      .subscribe({
+        next: () => {
+          this.toastService.showInfo(
+            $localize`Uploading new version. Processing will happen in the background.`
+          )
+          // Refresh metadata to reflect that versions changed (when ready)
+          this.openDocumentService.refreshDocument(this.documentId)
+        },
+        error: (error) => {
+          this.toastService.showError(
+            $localize`Error uploading new version`,
+            error
+          )
+        },
+      })
+  }
+
   download(original: boolean = false) {
     this.downloading = true
     const downloadUrl = this.documentsService.getDownloadUrl(
-      this.documentId,
+      this.selectedVersionId || this.documentId,
       original
     )
     this.http
@@ -1550,7 +1544,7 @@ export class DocumentDetailComponent
     const modal = this.modalService.open(EmailDocumentDialogComponent, {
       backdrop: 'static',
     })
-    modal.componentInstance.documentIds = [this.document.id]
+    modal.componentInstance.documentId = this.document.id
     modal.componentInstance.hasArchiveVersion =
       !!this.document?.archived_file_name
   }

src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html

@@ -1,147 +1,161 @@
 <div class="d-flex flex-wrap gap-4">
-  <div class="d-flex flex-wrap align-items-center gap-2" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }">
-    <label class="me-2" i18n>Edit:</label>
-    @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
-      <pngx-filterable-dropdown title="Tags" icon="tag-fill" i18n-title
-        filterPlaceholder="Filter tags" i18n-filterPlaceholder
-        [disabled]="!userCanEditAll || disabled"
-        [editing]="true"
-        [applyOnClose]="applyOnClose"
-        [createRef]="createTag.bind(this)"
-        (opened)="openTagsDropdown()"
-        [(selectionModel)]="tagSelectionModel"
-        [documentCounts]="tagDocumentCounts"
-        (apply)="setTags($event)"
-        shortcutKey="t">
-      </pngx-filterable-dropdown>
-    }
-    @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) {
-      <pngx-filterable-dropdown title="Correspondent" icon="person-fill" i18n-title
-        filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
-        [disabled]="!userCanEditAll || disabled"
-        [editing]="true"
-        [applyOnClose]="applyOnClose"
-        [createRef]="createCorrespondent.bind(this)"
-        (opened)="openCorrespondentDropdown()"
-        [(selectionModel)]="correspondentSelectionModel"
-        [documentCounts]="correspondentDocumentCounts"
-        (apply)="setCorrespondents($event)"
-        shortcutKey="y">
-      </pngx-filterable-dropdown>
-    }
-    @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) {
-      <pngx-filterable-dropdown title="Document type" icon="file-earmark-fill" i18n-title
-        filterPlaceholder="Filter document types" i18n-filterPlaceholder
-        [disabled]="!userCanEditAll || disabled"
-        [editing]="true"
-        [applyOnClose]="applyOnClose"
-        [createRef]="createDocumentType.bind(this)"
-        (opened)="openDocumentTypeDropdown()"
-        [(selectionModel)]="documentTypeSelectionModel"
-        [documentCounts]="documentTypeDocumentCounts"
-        (apply)="setDocumentTypes($event)"
-        shortcutKey="u">
-      </pngx-filterable-dropdown>
-    }
-    @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) {
-      <pngx-filterable-dropdown title="Storage path" icon="folder-fill" i18n-title
-        filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
-        [disabled]="!userCanEditAll || disabled"
-        [editing]="true"
-        [applyOnClose]="applyOnClose"
-        [createRef]="createStoragePath.bind(this)"
-        (opened)="openStoragePathDropdown()"
-        [(selectionModel)]="storagePathsSelectionModel"
-        [documentCounts]="storagePathDocumentCounts"
-        (apply)="setStoragePaths($event)"
-        shortcutKey="i">
-      </pngx-filterable-dropdown>
-    }
-    @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.CustomField)) {
-      <pngx-filterable-dropdown title="Custom fields" icon="ui-radios" i18n-title
-        filterPlaceholder="Filter custom fields" i18n-filterPlaceholder
-        [disabled]="!userCanEditAll"
-        [editing]="true"
-        [applyOnClose]="applyOnClose"
-        [createRef]="createCustomField.bind(this)"
-        (opened)="openCustomFieldsDropdown()"
-        [(selectionModel)]="customFieldsSelectionModel"
-        [documentCounts]="customFieldDocumentCounts"
-        extraButtonTitle="Set values"
-        i18n-extraButtonTitle
-        (extraButton)="setCustomFieldValues($event)"
-        (apply)="setCustomFields($event)">
-      </pngx-filterable-dropdown>
-    }
-    <div class="btn-group">
-      <button type="button" class="btn btn-sm btn-outline-primary me-2" (click)="setPermissions()" [disabled]="!userOwnsAll || !userCanEditAll">
-        <i-bs name="person-fill-lock"></i-bs><div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Permissions</ng-container></div>
+  <div class="d-flex align-items-center" role="group" aria-label="Select">
+    <button class="btn btn-sm btn-outline-secondary" (click)="list.selectNone()">
+      <i-bs name="slash-circle"></i-bs>&nbsp;<ng-container i18n>Cancel</ng-container>
       </button>
     </div>
-  </div>
-  <div class="d-flex align-items-center gap-2 ms-auto">
-    <div class="btn-toolbar">
-      <div ngbDropdown>
-        <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" [disabled]="!userCanEdit && !userCanAdd" ngbDropdownToggle>
-          <i-bs name="three-dots"></i-bs>
-          <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Actions</ng-container></div>
-        </button>
-        <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
-          <button ngbDropdownItem (click)="reprocessSelected()" [disabled]="!userCanEditAll && !userCanEditAll">
-            <i-bs name="body-text"></i-bs>&nbsp;<ng-container i18n>Reprocess</ng-container>
+    <div class="d-flex align-items-center gap-2" role="group" aria-label="Select">
+      <label class="me-2" i18n>Select:</label>
+      <div class="btn-group">
+        <button class="btn btn-sm btn-outline-primary" (click)="list.selectPage()">
+          <i-bs name="file-earmark-check"></i-bs>&nbsp;<ng-container i18n>Page</ng-container>
           </button>
-          <button ngbDropdownItem (click)="rotateSelected()" [disabled]="!userOwnsAll && !userCanEditAll">
-            <i-bs name="arrow-clockwise"></i-bs>&nbsp;<ng-container i18n>Rotate</ng-container>
-          </button>
-          <button ngbDropdownItem (click)="mergeSelected()" [disabled]="!userCanAdd || list.selected.size < 2">
-            <i-bs name="journals"></i-bs>&nbsp;<ng-container i18n>Merge</ng-container>
-          </button>
-          <button ngbDropdownItem (click)="emailSelected()" [disabled]="!userCanEdit">
-            <i-bs name="envelope"></i-bs>&nbsp;<ng-container i18n>Email</ng-container>
-          </button>
-        </div>
-      </div>
-    </div>
-    <div class="btn-group btn-group-sm">
-      <button class="btn btn-sm btn-outline-primary" [disabled]="awaitingDownload" (click)="downloadSelected()">
-        @if (!awaitingDownload) {
-          <i-bs name="arrow-down"></i-bs>
-        }
-        @if (awaitingDownload) {
-          <div class="spinner-border spinner-border-sm" role="status">
-            <span class="visually-hidden">Preparing download...</span>
+          <button class="btn btn-sm btn-outline-primary" (click)="list.selectAll()">
+            <i-bs name="check-all"></i-bs>&nbsp;<ng-container i18n>All</ng-container>
+            </button>
           </div>
-        }
-        <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Download</ng-container></div>
-      </button>
-      <div ngbDropdown class="me-2 d-flex btn-group" role="group">
-        <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle-split rounded-end" ngbDropdownToggle></button>
-        <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
-          <form [formGroup]="downloadForm" class="px-3 py-1">
-            <p class="mb-1" i18n>Include:</p>
-            <div class="form-group ps-3 mb-2">
-              <div class="form-check">
-                <input type="checkbox" class="form-check-input" id="downloadFileType_archive" formControlName="downloadFileTypeArchive" />
-                <label class="form-check-label" for="downloadFileType_archive" i18n>Archived files</label>
-              </div>
-              <div class="form-check">
-                <input type="checkbox" class="form-check-input" id="downloadFileType_originals" formControlName="downloadFileTypeOriginals" />
-                <label class="form-check-label" for="downloadFileType_originals" i18n>Original files</label>
-              </div>
-            </div>
-            <div class="form-check">
-              <input type="checkbox" class="form-check-input" id="downloadUseFormatting" formControlName="downloadUseFormatting" />
-              <label class="form-check-label" for="downloadUseFormatting" i18n>Use formatted filename</label>
-            </div>
-          </form>
         </div>
-      </div>
-    </div>
+        <div class="d-flex align-items-center gap-2" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }">
+          <label class="me-2" i18n>Edit:</label>
+          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
+            <pngx-filterable-dropdown title="Tags" icon="tag-fill" i18n-title
+              filterPlaceholder="Filter tags" i18n-filterPlaceholder
+              [disabled]="!userCanEditAll || disabled"
+              [editing]="true"
+              [applyOnClose]="applyOnClose"
+              [createRef]="createTag.bind(this)"
+              (opened)="openTagsDropdown()"
+              [(selectionModel)]="tagSelectionModel"
+              [documentCounts]="tagDocumentCounts"
+              (apply)="setTags($event)"
+              shortcutKey="t">
+            </pngx-filterable-dropdown>
+          }
+          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) {
+            <pngx-filterable-dropdown title="Correspondent" icon="person-fill" i18n-title
+              filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
+              [disabled]="!userCanEditAll || disabled"
+              [editing]="true"
+              [applyOnClose]="applyOnClose"
+              [createRef]="createCorrespondent.bind(this)"
+              (opened)="openCorrespondentDropdown()"
+              [(selectionModel)]="correspondentSelectionModel"
+              [documentCounts]="correspondentDocumentCounts"
+              (apply)="setCorrespondents($event)"
+              shortcutKey="y">
+            </pngx-filterable-dropdown>
+          }
+          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) {
+            <pngx-filterable-dropdown title="Document type" icon="file-earmark-fill" i18n-title
+              filterPlaceholder="Filter document types" i18n-filterPlaceholder
+              [disabled]="!userCanEditAll || disabled"
+              [editing]="true"
+              [applyOnClose]="applyOnClose"
+              [createRef]="createDocumentType.bind(this)"
+              (opened)="openDocumentTypeDropdown()"
+              [(selectionModel)]="documentTypeSelectionModel"
+              [documentCounts]="documentTypeDocumentCounts"
+              (apply)="setDocumentTypes($event)"
+              shortcutKey="u">
+            </pngx-filterable-dropdown>
+          }
+          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) {
+            <pngx-filterable-dropdown title="Storage path" icon="folder-fill" i18n-title
+              filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
+              [disabled]="!userCanEditAll || disabled"
+              [editing]="true"
+              [applyOnClose]="applyOnClose"
+              [createRef]="createStoragePath.bind(this)"
+              (opened)="openStoragePathDropdown()"
+              [(selectionModel)]="storagePathsSelectionModel"
+              [documentCounts]="storagePathDocumentCounts"
+              (apply)="setStoragePaths($event)"
+              shortcutKey="i">
+            </pngx-filterable-dropdown>
+          }
+          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.CustomField)) {
+            <pngx-filterable-dropdown title="Custom fields" icon="ui-radios" i18n-title
+              filterPlaceholder="Filter custom fields" i18n-filterPlaceholder
+              [disabled]="!userCanEditAll"
+              [editing]="true"
+              [applyOnClose]="applyOnClose"
+              [createRef]="createCustomField.bind(this)"
+              (opened)="openCustomFieldsDropdown()"
+              [(selectionModel)]="customFieldsSelectionModel"
+              [documentCounts]="customFieldDocumentCounts"
+              extraButtonTitle="Set values"
+              i18n-extraButtonTitle
+              (extraButton)="setCustomFieldValues($event)"
+              (apply)="setCustomFields($event)">
+            </pngx-filterable-dropdown>
+          }
+        </div>
+        <div class="d-flex align-items-center gap-2 ms-auto">
+          <div class="btn-toolbar">
 
-    <div class="btn-group btn-group-sm">
-      <button type="button" class="btn btn-sm btn-outline-danger" (click)="applyDelete()" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }" [disabled]="!userOwnsAll">
-        <i-bs name="trash"></i-bs>&nbsp;<ng-container i18n>Delete</ng-container>
-      </button>
-    </div>
-  </div>
-</div>
+            <button type="button" class="btn btn-sm btn-outline-primary me-2" (click)="setPermissions()" [disabled]="!userOwnsAll || !userCanEditAll">
+              <i-bs name="person-fill-lock"></i-bs><div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Permissions</ng-container></div>
+            </button>
+
+            <div ngbDropdown>
+              <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" [disabled]="!userCanEdit && !userCanAdd" ngbDropdownToggle>
+                <i-bs name="three-dots"></i-bs>
+                <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Actions</ng-container></div>
+              </button>
+              <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
+                <button ngbDropdownItem (click)="reprocessSelected()" [disabled]="!userCanEditAll && !userCanEditAll">
+                  <i-bs name="body-text"></i-bs>&nbsp;<ng-container i18n>Reprocess</ng-container>
+                </button>
+                <button ngbDropdownItem (click)="rotateSelected()" [disabled]="!userOwnsAll && !userCanEditAll">
+                  <i-bs name="arrow-clockwise"></i-bs>&nbsp;<ng-container i18n>Rotate</ng-container>
+                </button>
+                <button ngbDropdownItem (click)="mergeSelected()" [disabled]="!userCanAdd || list.selected.size < 2">
+                  <i-bs name="journals"></i-bs>&nbsp;<ng-container i18n>Merge</ng-container>
+                </button>
+              </div>
+            </div>
+          </div>
+
+            <div class="btn-group btn-group-sm">
+              <button class="btn btn-sm btn-outline-primary" [disabled]="awaitingDownload" (click)="downloadSelected()">
+                @if (!awaitingDownload) {
+                  <i-bs name="arrow-down"></i-bs>
+                }
+                @if (awaitingDownload) {
+                  <div class="spinner-border spinner-border-sm" role="status">
+                    <span class="visually-hidden">Preparing download...</span>
+                  </div>
+                }
+                <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Download</ng-container></div>
+              </button>
+              <div ngbDropdown class="me-2 d-flex btn-group" role="group">
+                <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle-split rounded-end" ngbDropdownToggle></button>
+                <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
+                  <form [formGroup]="downloadForm" class="px-3 py-1">
+                    <p class="mb-1" i18n>Include:</p>
+                    <div class="form-group ps-3 mb-2">
+                      <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="downloadFileType_archive" formControlName="downloadFileTypeArchive" />
+                        <label class="form-check-label" for="downloadFileType_archive" i18n>Archived files</label>
+                      </div>
+                      <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="downloadFileType_originals" formControlName="downloadFileTypeOriginals" />
+                        <label class="form-check-label" for="downloadFileType_originals" i18n>Original files</label>
+                      </div>
+                    </div>
+                    <div class="form-check">
+                      <input type="checkbox" class="form-check-input" id="downloadUseFormatting" formControlName="downloadUseFormatting" />
+                      <label class="form-check-label" for="downloadUseFormatting" i18n>Use formatted filename</label>
+                    </div>
+                  </form>
+                </div>
+              </div>
+            </div>
+
+            <div class="btn-group btn-group-sm">
+              <button type="button" class="btn btn-sm btn-outline-danger" (click)="applyDelete()" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }" [disabled]="!userOwnsAll">
+                <i-bs name="trash"></i-bs>&nbsp;<ng-container i18n>Delete</ng-container>
+                </button>
+              </div>
+            </div>
+          </div>

src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss

@@ -5,7 +5,3 @@
 .dropdown-menu{
     --bs-dropdown-min-width: 12rem;
 }
-
-.btn-group .btn {
-  white-space: nowrap;
-}

src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts

@@ -46,7 +46,6 @@ import { DocumentTypeEditDialogComponent } from '../../common/edit-dialog/docume
 import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component'
 import { StoragePathEditDialogComponent } from '../../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component'
 import { TagEditDialogComponent } from '../../common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component'
-import { EmailDocumentDialogComponent } from '../../common/email-document-dialog/email-document-dialog.component'
 import {
   ChangedItems,
   FilterableDropdownComponent,
@@ -903,16 +902,4 @@ export class BulkEditorComponent
       )
     })
   }
-
-  emailSelected() {
-    const allHaveArchiveVersion = this.list.documents
-      .filter((d) => this.list.selected.has(d.id))
-      .every((doc) => !!doc.archived_file_name)
-
-    const modal = this.modalService.open(EmailDocumentDialogComponent, {
-      backdrop: 'static',
-    })
-    modal.componentInstance.documentIds = Array.from(this.list.selected)
-    modal.componentInstance.hasArchiveVersion = allHaveArchiveVersion
-  }
 }

src-ui/src/app/components/document-list/document-list.component.html

@@ -1,36 +1,16 @@
 <pngx-page-header [title]="getTitle()">
-  <div ngbDropdown class="btn-group flex-fill d-sm-none">
-    <button class="btn btn-sm btn-outline-primary" id="dropdownSelectMobile" ngbDropdownToggle>
+
+  <div ngbDropdown class="btn-group flex-fill">
+    <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" ngbDropdownToggle>
       <i-bs name="text-indent-left"></i-bs>
       <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Select</ng-container></div>
-      @if (list.selected.size > 0) {
-        <pngx-clearable-badge [selected]="list.selected.size > 0" [number]="list.selected.size" (cleared)="list.selectNone()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
-      }
     </button>
-    <div ngbDropdownMenu aria-labelledby="dropdownSelectMobile" class="shadow">
+    <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow">
       <button ngbDropdownItem (click)="list.selectNone()" i18n>Select none</button>
       <button ngbDropdownItem (click)="list.selectPage()" i18n>Select page</button>
       <button ngbDropdownItem (click)="list.selectAll()" i18n>Select all</button>
     </div>
   </div>
-  <div class="d-none d-sm-flex flex-fill me-3">
-    <div class="input-group input-group-sm">
-      <span class="input-group-text border-0">Select:</span>
-    </div>
-    <div class="btn-group btn-group-sm flex-nowrap">
-      @if (list.selected.size > 0) {
-        <button class="btn btn-sm btn-outline-secondary" (click)="list.selectNone()">
-          <i-bs name="slash-circle"></i-bs>&nbsp;<ng-container i18n>None</ng-container>
-        </button>
-      }
-      <button class="btn btn-sm btn-outline-primary" (click)="list.selectPage()">
-        <i-bs name="file-earmark-check"></i-bs>&nbsp;<ng-container i18n>Page</ng-container>
-      </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="list.selectAll()">
-        <i-bs name="check-all"></i-bs>&nbsp;<ng-container i18n>All</ng-container>
-      </button>
-    </div>
-  </div>
   <div ngbDropdown class="btn-group flex-fill">
     <button class="btn btn-sm btn-outline-primary" id="dropdownDisplayFields" ngbDropdownToggle>
       <i-bs name="card-heading"></i-bs>
@@ -146,13 +126,8 @@
       @if (!list.isReloading && isFiltered) {
         <button class="btn btn-link py-0" (click)="resetFilters()">
           <i-bs width="1em" height="1em" name="x"></i-bs><small i18n>Reset filters</small>
-        </button>
-      }
-      @if (!list.isReloading && list.selected.size > 0) {
-        <button class="btn btn-link py-0" (click)="list.selectNone()">
-          <i-bs width="1em" height="1em" name="slash-circle" class="me-1"></i-bs><small i18n>Clear selection</small>
-        </button>
-      }
+          </button>
+        }
       </div>
       @if (list.collectionSize) {
         <ngb-pagination [pageSize]="list.pageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"

src-ui/src/app/components/document-list/document-list.component.ts

@@ -56,7 +56,6 @@ import {
   filterRulesDiffer,
   isFullTextFilterRule,
 } from 'src/app/utils/filter-rules'
-import { ClearableBadgeComponent } from '../common/clearable-badge/clearable-badge.component'
 import { CustomFieldDisplayComponent } from '../common/custom-field-display/custom-field-display.component'
 import { PageHeaderComponent } from '../common/page-header/page-header.component'
 import { PreviewPopupComponent } from '../common/preview-popup/preview-popup.component'
@@ -73,7 +72,6 @@ import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-vi
   templateUrl: './document-list.component.html',
   styleUrls: ['./document-list.component.scss'],
   imports: [
-    ClearableBadgeComponent,
     CustomFieldDisplayComponent,
     PageHeaderComponent,
     BulkEditorComponent,

src-ui/src/app/components/manage/mail/mail.component.html

@@ -109,11 +109,10 @@
     <li class="list-group-item">
       <div class="row">
         <div class="col" i18n>Name</div>
-        <div class="col-1 d-none d-sm-block" i18n>Sort Order</div>
-        <div class="col-2" i18n>Account</div>
-        <div class="col-2 d-none d-sm-block" i18n>Status</div>
-        <div class="col d-none d-sm-block" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.ProcessedMail }">Processed Mail</div>
-        <div class="col-3" i18n>Actions</div>
+        <div class="col d-none d-sm-block" i18n>Sort Order</div>
+        <div class="col" i18n>Account</div>
+        <div class="col d-none d-sm-block" i18n>Status</div>
+        <div class="col" i18n>Actions</div>
       </div>
     </li>
 
@@ -128,9 +127,9 @@
       <li class="list-group-item">
         <div class="row fade" [class.show]="showRules">
           <div class="col d-flex align-items-center"><button class="btn btn-link p-0 text-start" type="button" (click)="editMailRule(rule)" [disabled]="!permissionsService.currentUserCan(PermissionAction.Change, PermissionType.MailRule) || !userCanEdit(rule)">{{rule.name}}</button></div>
-          <div class="col-1 d-flex align-items-center d-none d-sm-flex">{{rule.order}}</div>
-          <div class="col-2 d-flex align-items-center">{{(mailAccountService.getCached(rule.account) | async)?.name}}</div>
-          <div class="col-2 d-flex align-items-center d-none d-sm-flex">
+          <div class="col d-flex align-items-center d-none d-sm-flex">{{rule.order}}</div>
+          <div class="col d-flex align-items-center">{{(mailAccountService.getCached(rule.account) | async)?.name}}</div>
+          <div class="col d-flex align-items-center d-none d-sm-flex">
             <div class="form-check form-switch mb-0">
               <input #inputField type="checkbox" class="form-check-input cursor-pointer" [id]="rule.id+'_enable'" [(ngModel)]="rule.enabled" (change)="onMailRuleEnableToggled(rule)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailRule }">
               <label class="form-check-label cursor-pointer" [for]="rule.id+'_enable'">
@@ -138,12 +137,7 @@
               </label>
             </div>
           </div>
-          <div class="col d-flex align-items-center d-none d-sm-flex" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.ProcessedMail }">
-            <button class="btn btn-sm btn-outline-secondary" type="button" (click)="viewProcessedMail(rule)">
-              <i-bs width="1em" height="1em" name="clock-history"></i-bs>&nbsp;<ng-container i18n>View Processed Mail</ng-container>
-            </button>
-          </div>
-          <div class="col-3">
+          <div class="col">
             <div class="btn-group d-block d-sm-none">
               <div ngbDropdown container="body" class="d-inline-block">
                 <button type="button" class="btn btn-link" id="actionsMenuMobile" (click)="$event.stopPropagation()" ngbDropdownToggle>

src-ui/src/app/components/manage/mail/mail.component.spec.ts

@@ -409,13 +409,4 @@ describe('MailComponent', () => {
     jest.advanceTimersByTime(200)
     expect(editSpy).toHaveBeenCalled()
   })
-
-  it('should open processed mails dialog', () => {
-    completeSetup()
-    let modal: NgbModalRef
-    modalService.activeInstances.subscribe((refs) => (modal = refs[0]))
-    component.viewProcessedMail(mailRules[0] as MailRule)
-    const dialog = modal.componentInstance as any
-    expect(dialog.rule).toEqual(mailRules[0])
-  })
 })

src-ui/src/app/components/manage/mail/mail.component.ts

@@ -27,7 +27,6 @@ import { MailRuleEditDialogComponent } from '../../common/edit-dialog/mail-rule-
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { PermissionsDialogComponent } from '../../common/permissions-dialog/permissions-dialog.component'
 import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component'
-import { ProcessedMailDialogComponent } from './processed-mail-dialog/processed-mail-dialog.component'
 
 @Component({
   selector: 'pngx-mail',
@@ -348,14 +347,6 @@ export class MailComponent
     )
   }
 
-  viewProcessedMail(rule: MailRule) {
-    const modal = this.modalService.open(ProcessedMailDialogComponent, {
-      backdrop: 'static',
-      size: 'xl',
-    })
-    modal.componentInstance.rule = rule
-  }
-
   userCanEdit(obj: ObjectWithPermissions): boolean {
     return this.permissionsService.currentUserHasObjectPermissions(
       PermissionAction.Change,

src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html

@@ -1,107 +0,0 @@
-<div class="modal-header">
-  <h6 class="modal-title" id="modal-basic-title" i18n>Processed Mail for <em>{{ rule.name }}</em></h6>
-  <button class="btn btn-sm btn-link text-muted me-auto p-0 p-md-2" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
-    <i-bs name="question-circle"></i-bs>
-  </button>
-  <ng-template #infoPopover>
-    <a href="https://docs.paperless-ngx.com/usage#processed-mail" target="_blank" referrerpolicy="noopener noreferrer" i18n>Read more</a>
-    <i-bs class="ms-1" width=".8em" height=".8em" name="box-arrow-up-right"></i-bs>
-  </ng-template>
-  <button type="button" class="btn-close" aria-label="Close" (click)="close()"></button>
-</div>
-<div class="modal-body">
-  @if (loading) {
-    <div class="text-center my-5">
-      <div class="spinner-border" role="status">
-        <span class="visually-hidden" i18n>Loading...</span>
-      </div>
-    </div>
-  } @else if (processedMails.length === 0) {
-    <span i18n>No processed email messages found.</span>
-  } @else {
-    <div class="table-responsive">
-      <table class="table table-hover table-sm align-middle">
-        <thead>
-          <tr>
-            <th scope="col" style="width: 40px;">
-              <div class="form-check m-0 ms-2 me-n2">
-                <input type="checkbox" class="form-check-input" id="all-objects" [(ngModel)]="toggleAllEnabled" [disabled]="processedMails.length === 0" (click)="toggleAll($event); $event.stopPropagation();">
-                <label class="form-check-label" for="all-objects"></label>
-              </div>
-            </th>
-            <th scope="col" i18n>Subject</th>
-            <th scope="col" i18n>Received</th>
-            <th scope="col" i18n>Processed</th>
-            <th scope="col" i18n>Status</th>
-            <th scope="col" i18n>Error</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (mail of processedMails; track mail.id) {
-            <ng-template #statusTooltip>
-              <div class="small text-light font-monospace">
-                  {{mail.status}}
-              </div>
-            </ng-template>
-            <tr>
-              <td>
-                <div class="form-check m-0 ms-2 me-n2">
-                  <input type="checkbox" class="form-check-input" [id]="mail.id" [checked]="selectedMailIds.has(mail.id)" (click)="toggleSelected(mail); $event.stopPropagation();">
-                  <label class="form-check-label" [for]="mail.id"></label>
-                </div>
-              </td>
-              <td>{{ mail.subject }}</td>
-              <td>{{ mail.received | customDate:'longDate' }}</td>
-              <td>{{ mail.processed | customDate:'longDate' }}</td>
-              <td>
-                @switch (mail.status) {
-                  @case ('SUCCESS') {
-                    <i-bs name="check-circle" title="SUCCESS" class="text-success" [ngbTooltip]="statusTooltip"></i-bs>
-                  }
-                  @case ('FAILED') {
-                    <i-bs name="exclamation-triangle" title="FAILED" class="text-danger" [ngbTooltip]="statusTooltip"></i-bs>
-                  }
-                  @default {
-                    <i-bs name="slash-circle" title="{{ mail.status }}" class="text-muted" [ngbTooltip]="statusTooltip"></i-bs>
-                  }
-                }
-              </td>
-              <td>
-                <ng-template #errorPopover>
-                  <pre class="small text-light">
-                    {{ mail.error }}
-                  </pre>
-                </ng-template>
-                @if (mail.error) {
-                  <span class="text-danger" triggers="mouseenter:mouseleave" [ngbPopover]="errorPopover">{{ mail.error | slice:0:20 }}</span>
-                }
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-    <div class="btn-toolbar">
-      <button type="button" class="btn btn-outline-secondary me-2" (click)="clearSelection()" [disabled]="selectedMailIds.size === 0" i18n>Clear</button>
-      <pngx-confirm-button
-        label="Delete selected"
-        i18n-label
-        title="Delete selected"
-        i18n-title
-        buttonClasses="btn-outline-danger"
-        iconName="trash"
-        [disabled]="selectedMailIds.size === 0"
-        (confirm)="deleteSelected()">
-      </pngx-confirm-button>
-      <div class="ms-auto">
-        <ngb-pagination
-          [collectionSize]="processedMails.length"
-          [(page)]="page"
-          [pageSize]="50"
-          [maxSize]="5"
-          (pageChange)="loadProcessedMails()">
-        </ngb-pagination>
-      </div>
-    </div>
-  }
-</div>

src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.scss

@@ -1,8 +0,0 @@
-::ng-deep .popover {
-    max-width: 350px;
-
-    pre {
-        white-space: pre-wrap;
-        word-break: break-word;
-    }
-}

src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts

@@ -1,150 +0,0 @@
-import { DatePipe } from '@angular/common'
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
-import {
-  HttpTestingController,
-  provideHttpClientTesting,
-} from '@angular/common/http/testing'
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { FormsModule } from '@angular/forms'
-import { By } from '@angular/platform-browser'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { ToastService } from 'src/app/services/toast.service'
-import { environment } from 'src/environments/environment'
-import { ProcessedMailDialogComponent } from './processed-mail-dialog.component'
-
-describe('ProcessedMailDialogComponent', () => {
-  let component: ProcessedMailDialogComponent
-  let fixture: ComponentFixture<ProcessedMailDialogComponent>
-  let httpTestingController: HttpTestingController
-  let toastService: ToastService
-
-  const rule: any = { id: 10, name: 'Mail Rule' } // minimal rule object for tests
-  const mails = [
-    {
-      id: 1,
-      rule: rule.id,
-      folder: 'INBOX',
-      uid: 111,
-      subject: 'A',
-      received: new Date().toISOString(),
-      processed: new Date().toISOString(),
-      status: 'SUCCESS',
-      error: null,
-    },
-    {
-      id: 2,
-      rule: rule.id,
-      folder: 'INBOX',
-      uid: 222,
-      subject: 'B',
-      received: new Date().toISOString(),
-      processed: new Date().toISOString(),
-      status: 'FAILED',
-      error: 'Oops',
-    },
-  ]
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        ProcessedMailDialogComponent,
-        FormsModule,
-        NgxBootstrapIconsModule.pick(allIcons),
-      ],
-      providers: [
-        DatePipe,
-        NgbActiveModal,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    }).compileComponents()
-
-    httpTestingController = TestBed.inject(HttpTestingController)
-    toastService = TestBed.inject(ToastService)
-    fixture = TestBed.createComponent(ProcessedMailDialogComponent)
-    component = fixture.componentInstance
-    component.rule = rule
-  })
-
-  afterEach(() => {
-    httpTestingController.verify()
-  })
-
-  function expectListRequest(ruleId: number) {
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}processed_mail/?page=1&page_size=50&ordering=-processed_at&rule=${ruleId}`
-    )
-    expect(req.request.method).toEqual('GET')
-    return req
-  }
-
-  it('should load processed mails on init', () => {
-    fixture.detectChanges()
-    const req = expectListRequest(rule.id)
-    req.flush({ count: 2, results: mails })
-    expect(component.loading).toBeFalsy()
-    expect(component.processedMails).toEqual(mails)
-  })
-
-  it('should delete selected mails and reload', () => {
-    fixture.detectChanges()
-    // initial load
-    const initialReq = expectListRequest(rule.id)
-    initialReq.flush({ count: 0, results: [] })
-
-    // select a couple of mails and delete
-    component.selectedMailIds.add(5)
-    component.selectedMailIds.add(6)
-    const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
-    component.deleteSelected()
-
-    const delReq = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}processed_mail/bulk_delete/`
-    )
-    expect(delReq.request.method).toEqual('POST')
-    expect(delReq.request.body).toEqual({ mail_ids: [5, 6] })
-    delReq.flush({})
-
-    // reload after delete
-    const reloadReq = expectListRequest(rule.id)
-    reloadReq.flush({ count: 0, results: [] })
-    expect(toastInfoSpy).toHaveBeenCalled()
-  })
-
-  it('should toggle all, toggle selected, and clear selection', () => {
-    fixture.detectChanges()
-    // initial load with two mails
-    const req = expectListRequest(rule.id)
-    req.flush({ count: 2, results: mails })
-    fixture.detectChanges()
-
-    // toggle all via header checkbox
-    const inputs = fixture.debugElement.queryAll(
-      By.css('input.form-check-input')
-    )
-    const header = inputs[0].nativeElement as HTMLInputElement
-    header.dispatchEvent(new Event('click'))
-    header.checked = true
-    header.dispatchEvent(new Event('click'))
-    expect(component.selectedMailIds.size).toEqual(mails.length)
-
-    // toggle a single mail
-    component.toggleSelected(mails[0] as any)
-    expect(component.selectedMailIds.has(mails[0].id)).toBeFalsy()
-    component.toggleSelected(mails[0] as any)
-    expect(component.selectedMailIds.has(mails[0].id)).toBeTruthy()
-
-    // clear selection
-    component.clearSelection()
-    expect(component.selectedMailIds.size).toEqual(0)
-    expect(component.toggleAllEnabled).toBeFalsy()
-  })
-
-  it('should close the dialog', () => {
-    const activeModal = TestBed.inject(NgbActiveModal)
-    const closeSpy = jest.spyOn(activeModal, 'close')
-    component.close()
-    expect(closeSpy).toHaveBeenCalled()
-  })
-})

src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts

@@ -1,96 +0,0 @@
-import { SlicePipe } from '@angular/common'
-import { Component, inject, Input, OnInit } from '@angular/core'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import {
-  NgbActiveModal,
-  NgbPagination,
-  NgbPopoverModule,
-  NgbTooltipModule,
-} from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { ConfirmButtonComponent } from 'src/app/components/common/confirm-button/confirm-button.component'
-import { MailRule } from 'src/app/data/mail-rule'
-import { ProcessedMail } from 'src/app/data/processed-mail'
-import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
-import { ProcessedMailService } from 'src/app/services/rest/processed-mail.service'
-import { ToastService } from 'src/app/services/toast.service'
-
-@Component({
-  selector: 'pngx-processed-mail-dialog',
-  imports: [
-    ConfirmButtonComponent,
-    CustomDatePipe,
-    NgbPagination,
-    NgbPopoverModule,
-    NgbTooltipModule,
-    NgxBootstrapIconsModule,
-    FormsModule,
-    ReactiveFormsModule,
-    SlicePipe,
-  ],
-  templateUrl: './processed-mail-dialog.component.html',
-  styleUrl: './processed-mail-dialog.component.scss',
-})
-export class ProcessedMailDialogComponent implements OnInit {
-  private readonly activeModal = inject(NgbActiveModal)
-  private readonly processedMailService = inject(ProcessedMailService)
-  private readonly toastService = inject(ToastService)
-
-  public processedMails: ProcessedMail[] = []
-
-  public loading: boolean = true
-  public toggleAllEnabled: boolean = false
-  public readonly selectedMailIds: Set<number> = new Set<number>()
-
-  public page: number = 1
-
-  @Input() rule: MailRule
-
-  ngOnInit(): void {
-    this.loadProcessedMails()
-  }
-
-  public close() {
-    this.activeModal.close()
-  }
-
-  private loadProcessedMails(): void {
-    this.loading = true
-    this.clearSelection()
-    this.processedMailService
-      .list(this.page, 50, 'processed_at', true, { rule: this.rule.id })
-      .subscribe((result) => {
-        this.processedMails = result.results
-        this.loading = false
-      })
-  }
-
-  public deleteSelected(): void {
-    this.processedMailService
-      .bulk_delete(Array.from(this.selectedMailIds))
-      .subscribe(() => {
-        this.toastService.showInfo($localize`Processed mail(s) deleted`)
-        this.loadProcessedMails()
-      })
-  }
-
-  public toggleAll(event: PointerEvent) {
-    if ((event.target as HTMLInputElement).checked) {
-      this.selectedMailIds.clear()
-      this.processedMails.forEach((mail) => this.selectedMailIds.add(mail.id))
-    } else {
-      this.clearSelection()
-    }
-  }
-
-  public clearSelection() {
-    this.toggleAllEnabled = false
-    this.selectedMailIds.clear()
-  }
-
-  public toggleSelected(mail: ProcessedMail) {
-    this.selectedMailIds.has(mail.id)
-      ? this.selectedMailIds.delete(mail.id)
-      : this.selectedMailIds.add(mail.id)
-  }
-}

src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts

@@ -71,20 +71,4 @@ describe('TagListComponent', () => {
       'Do you really want to delete the tag "Tag1"?'
     )
   })
-
-  it('should filter out child tags if name filter is empty, otherwise show all', () => {
-    const tags = [
-      { id: 1, name: 'Tag1', parent: null },
-      { id: 2, name: 'Tag2', parent: 1 },
-      { id: 3, name: 'Tag3', parent: null },
-    ]
-    component['_nameFilter'] = null // Simulate empty name filter
-    const filtered = component.filterData(tags as any)
-    expect(filtered.length).toBe(2)
-    expect(filtered.find((t) => t.id === 2)).toBeUndefined()
-
-    component['_nameFilter'] = 'Tag2' // Simulate non-empty name filter
-    const filteredWithName = component.filterData(tags as any)
-    expect(filteredWithName.length).toBe(3)
-  })
 })

src-ui/src/app/components/manage/tag-list/tag-list.component.ts

@@ -62,8 +62,6 @@ export class TagListComponent extends ManagementListComponent<Tag> {
   }
 
   filterData(data: Tag[]) {
-    return this.nameFilter?.length
-      ? [...data]
-      : data.filter((tag) => !tag.parent)
+    return data.filter((tag) => !tag.parent)
   }
 }

src-ui/src/app/data/document-suggestions.ts

@@ -1,17 +1,11 @@
 export interface DocumentSuggestions {
-  title?: string
-
   tags?: number[]
-  suggested_tags?: string[]
 
   correspondents?: number[]
-  suggested_correspondents?: string[]
 
   document_types?: number[]
-  suggested_document_types?: string[]
 
   storage_paths?: number[]
-  suggested_storage_paths?: string[]
 
   dates?: string[] // ISO-formatted date string e.g. 2022-11-03
 }

src-ui/src/app/data/document.ts

@@ -159,6 +159,10 @@ export interface Document extends ObjectWithPermissions {
 
   page_count?: number
 
+  // Versioning
+  head_version?: number
+  versions?: number[]
+
   // Frontend only
   __changedFields?: string[]
 }

src-ui/src/app/data/paperless-config.ts

@@ -44,24 +44,12 @@ export enum ConfigOptionType {
   Boolean = 'boolean',
   JSON = 'json',
   File = 'file',
-  Password = 'password',
 }
 
 export const ConfigCategory = {
   General: $localize`General Settings`,
   OCR: $localize`OCR Settings`,
   Barcode: $localize`Barcode Settings`,
-  AI: $localize`AI Settings`,
-}
-
-export const LLMEmbeddingBackendConfig = {
-  OPENAI: 'openai',
-  HUGGINGFACE: 'huggingface',
-}
-
-export const LLMBackendConfig = {
-  OPENAI: 'openai',
-  OLLAMA: 'ollama',
 }
 
 export interface ConfigOption {
@@ -71,7 +59,6 @@ export interface ConfigOption {
   choices?: Array<{ id: string; name: string }>
   config_key?: string
   category: string
-  note?: string
 }
 
 function mapToItems(enumObj: Object): Array<{ id: string; name: string }> {
@@ -271,58 +258,6 @@ export const PaperlessConfigOptions: ConfigOption[] = [
     config_key: 'PAPERLESS_CONSUMER_TAG_BARCODE_MAPPING',
     category: ConfigCategory.Barcode,
   },
-  {
-    key: 'ai_enabled',
-    title: $localize`AI Enabled`,
-    type: ConfigOptionType.Boolean,
-    config_key: 'PAPERLESS_AI_ENABLED',
-    category: ConfigCategory.AI,
-    note: $localize`Consider privacy implications when enabling AI features, especially if using a remote model.`,
-  },
-  {
-    key: 'llm_embedding_backend',
-    title: $localize`LLM Embedding Backend`,
-    type: ConfigOptionType.Select,
-    choices: mapToItems(LLMEmbeddingBackendConfig),
-    config_key: 'PAPERLESS_AI_LLM_EMBEDDING_BACKEND',
-    category: ConfigCategory.AI,
-  },
-  {
-    key: 'llm_embedding_model',
-    title: $localize`LLM Embedding Model`,
-    type: ConfigOptionType.String,
-    config_key: 'PAPERLESS_AI_LLM_EMBEDDING_MODEL',
-    category: ConfigCategory.AI,
-  },
-  {
-    key: 'llm_backend',
-    title: $localize`LLM Backend`,
-    type: ConfigOptionType.Select,
-    choices: mapToItems(LLMBackendConfig),
-    config_key: 'PAPERLESS_AI_LLM_BACKEND',
-    category: ConfigCategory.AI,
-  },
-  {
-    key: 'llm_model',
-    title: $localize`LLM Model`,
-    type: ConfigOptionType.String,
-    config_key: 'PAPERLESS_AI_LLM_MODEL',
-    category: ConfigCategory.AI,
-  },
-  {
-    key: 'llm_api_key',
-    title: $localize`LLM API Key`,
-    type: ConfigOptionType.Password,
-    config_key: 'PAPERLESS_AI_LLM_API_KEY',
-    category: ConfigCategory.AI,
-  },
-  {
-    key: 'llm_endpoint',
-    title: $localize`LLM Endpoint`,
-    type: ConfigOptionType.String,
-    config_key: 'PAPERLESS_AI_LLM_ENDPOINT',
-    category: ConfigCategory.AI,
-  },
 ]
 
 export interface PaperlessConfig extends ObjectWithId {
@@ -352,11 +287,4 @@ export interface PaperlessConfig extends ObjectWithId {
   barcode_max_pages: number
   barcode_enable_tag: boolean
   barcode_tag_mapping: object
-  ai_enabled: boolean
-  llm_embedding_backend: string
-  llm_embedding_model: string
-  llm_backend: string
-  llm_model: string
-  llm_api_key: string
-  llm_endpoint: string
 }

src-ui/src/app/data/paperless-task.ts

@@ -11,7 +11,6 @@ export enum PaperlessTaskName {
   TrainClassifier = 'train_classifier',
   SanityCheck = 'check_sanity',
   IndexOptimize = 'index_optimize',
-  LLMIndexUpdate = 'llmindex_update',
 }
 
 export enum PaperlessTaskStatus {

src-ui/src/app/data/processed-mail.ts

@@ -1,12 +0,0 @@
-import { ObjectWithId } from './object-with-id'
-
-export interface ProcessedMail extends ObjectWithId {
-  rule: number // MailRule.id
-  folder: string
-  uid: number
-  subject: string
-  received: Date
-  processed: Date
-  status: string
-  error: string
-}

src-ui/src/app/data/system-status.ts

@@ -7,7 +7,6 @@ export enum SystemStatusItemStatus {
   OK = 'OK',
   ERROR = 'ERROR',
   WARNING = 'WARNING',
-  DISABLED = 'DISABLED',
 }
 
 export interface SystemStatus {
@@ -44,9 +43,6 @@ export interface SystemStatus {
     sanity_check_status: SystemStatusItemStatus
     sanity_check_last_run: string // ISO date string
     sanity_check_error: string
-    llmindex_status: SystemStatusItemStatus
-    llmindex_last_modified: string // ISO date string
-    llmindex_error: string
   }
   websocket_connected?: SystemStatusItemStatus // added client-side
 }

src-ui/src/app/data/ui-settings.ts

@@ -76,7 +76,6 @@ export const SETTINGS_KEYS = {
   GMAIL_OAUTH_URL: 'gmail_oauth_url',
   OUTLOOK_OAUTH_URL: 'outlook_oauth_url',
   EMAIL_ENABLED: 'email_enabled',
-  AI_ENABLED: 'ai_enabled',
 }
 
 export const SETTINGS: UiSetting[] = [
@@ -290,9 +289,4 @@ export const SETTINGS: UiSetting[] = [
     type: 'string',
     default: 'page-width', // ZoomSetting from 'document-detail.component'
   },
-  {
-    key: SETTINGS_KEYS.AI_ENABLED,
-    type: 'boolean',
-    default: false,
-  },
 ]

src-ui/src/app/data/workflow-trigger.ts

@@ -40,18 +40,6 @@ export interface WorkflowTrigger extends ObjectWithId {
 
   filter_has_tags?: number[] // Tag.id[]
 
-  filter_has_all_tags?: number[] // Tag.id[]
-
-  filter_has_not_tags?: number[] // Tag.id[]
-
-  filter_has_not_correspondents?: number[] // Correspondent.id[]
-
-  filter_has_not_document_types?: number[] // DocumentType.id[]
-
-  filter_has_not_storage_paths?: number[] // StoragePath.id[]
-
-  filter_custom_field_query?: string
-
   filter_has_correspondent?: number // Correspondent.id
 
   filter_has_document_type?: number // DocumentType.id

src-ui/src/app/interceptors/csrf.interceptor.ts

@@ -4,15 +4,15 @@ import {
   HttpInterceptor,
   HttpRequest,
 } from '@angular/common/http'
-import { inject, Injectable } from '@angular/core'
+import { Injectable, inject } from '@angular/core'
 import { Meta } from '@angular/platform-browser'
 import { CookieService } from 'ngx-cookie-service'
 import { Observable } from 'rxjs'
 
 @Injectable()
 export class CsrfInterceptor implements HttpInterceptor {
-  private cookieService: CookieService = inject(CookieService)
-  private meta: Meta = inject(Meta)
+  private cookieService = inject(CookieService)
+  private meta = inject(Meta)
 
   intercept(
     request: HttpRequest<unknown>,

src-ui/src/app/services/chat.service.spec.ts

@@ -1,58 +0,0 @@
-import {
-  HttpEventType,
-  provideHttpClient,
-  withInterceptorsFromDi,
-} from '@angular/common/http'
-import {
-  HttpTestingController,
-  provideHttpClientTesting,
-} from '@angular/common/http/testing'
-import { TestBed } from '@angular/core/testing'
-import { environment } from 'src/environments/environment'
-import { ChatService } from './chat.service'
-
-describe('ChatService', () => {
-  let service: ChatService
-  let httpMock: HttpTestingController
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [],
-      providers: [
-        ChatService,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    })
-    service = TestBed.inject(ChatService)
-    httpMock = TestBed.inject(HttpTestingController)
-  })
-
-  afterEach(() => {
-    httpMock.verify()
-  })
-
-  it('should stream chat messages', (done) => {
-    const documentId = 1
-    const prompt = 'Hello, world!'
-    const mockResponse = 'Partial response text'
-    const apiUrl = `${environment.apiBaseUrl}documents/chat/`
-
-    service.streamChat(documentId, prompt).subscribe((chunk) => {
-      expect(chunk).toBe(mockResponse)
-      done()
-    })
-
-    const req = httpMock.expectOne(apiUrl)
-    expect(req.request.method).toBe('POST')
-    expect(req.request.body).toEqual({
-      document_id: documentId,
-      q: prompt,
-    })
-
-    req.event({
-      type: HttpEventType.DownloadProgress,
-      partialText: mockResponse,
-    } as any)
-  })
-})

src-ui/src/app/services/chat.service.ts

@@ -1,46 +0,0 @@
-import {
-  HttpClient,
-  HttpDownloadProgressEvent,
-  HttpEventType,
-} from '@angular/common/http'
-import { inject, Injectable } from '@angular/core'
-import { filter, map, Observable } from 'rxjs'
-import { environment } from 'src/environments/environment'
-
-export interface ChatMessage {
-  role: 'user' | 'assistant'
-  content: string
-  isStreaming?: boolean
-}
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ChatService {
-  private http: HttpClient = inject(HttpClient)
-
-  streamChat(documentId: number, prompt: string): Observable<string> {
-    return this.http
-      .post(
-        `${environment.apiBaseUrl}documents/chat/`,
-        {
-          document_id: documentId,
-          q: prompt,
-        },
-        {
-          observe: 'events',
-          reportProgress: true,
-          responseType: 'text',
-          withCredentials: true,
-        }
-      )
-      .pipe(
-        map((event) => {
-          if (event.type === HttpEventType.DownloadProgress) {
-            return (event as HttpDownloadProgressEvent).partialText!
-          }
-        }),
-        filter((chunk) => !!chunk)
-      )
-  }
-}

src-ui/src/app/services/permissions.service.ts

@@ -28,7 +28,6 @@ export enum PermissionType {
   ShareLink = '%s_sharelink',
   CustomField = '%s_customfield',
   Workflow = '%s_workflow',
-  ProcessedMail = '%s_processedmail',
 }
 
 @Injectable({

src-ui/src/app/services/rest/document.service.spec.ts

@@ -357,15 +357,17 @@ it('should include custom fields in sort fields if user has permission', () => {
 
 it('should call appropriate api endpoint for email document', () => {
   subscription = service
-    .emailDocuments(
-      [documents[0].id],
+    .emailDocument(
+      documents[0].id,
       'hello@paperless-ngx.com',
       'hello',
       'world',
       true
     )
     .subscribe()
-  httpTestingController.expectOne(`${environment.apiBaseUrl}${endpoint}/email/`)
+  httpTestingController.expectOne(
+    `${environment.apiBaseUrl}${endpoint}/${documents[0].id}/email/`
+  )
 })
 
 afterEach(() => {

src-ui/src/app/services/rest/document.service.ts

@@ -163,12 +163,19 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     })
   }
 
-  getPreviewUrl(id: number, original: boolean = false): string {
+  getPreviewUrl(
+    id: number,
+    original: boolean = false,
+    versionID: number = null
+  ): string {
     let url = new URL(this.getResourceUrl(id, 'preview'))
     if (this._searchQuery) url.hash = `#search="${this.searchQuery}"`
     if (original) {
       url.searchParams.append('original', 'true')
     }
+    if (versionID) {
+      url.searchParams.append('version', versionID.toString())
+    }
     return url.toString()
   }
 
@@ -184,6 +191,16 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     return url
   }
 
+  uploadVersion(documentId: number, file: File) {
+    const formData = new FormData()
+    formData.append('document', file, file.name)
+    return this.http.post(
+      this.getResourceUrl(documentId, 'update_version'),
+      formData,
+      { reportProgress: true, observe: 'events' }
+    )
+  }
+
   getNextAsn(): Observable<number> {
     return this.http.get<number>(this.getResourceUrl(null, 'next_asn'))
   }
@@ -256,15 +273,14 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     return this._searchQuery
   }
 
-  emailDocuments(
-    documentIds: number[],
+  emailDocument(
+    documentId: number,
     addresses: string,
     subject: string,
     message: string,
     useArchiveVersion: boolean
   ): Observable<any> {
-    return this.http.post(this.getResourceUrl(null, 'email'), {
-      documents: documentIds,
+    return this.http.post(this.getResourceUrl(documentId, 'email'), {
       addresses: addresses,
       subject: subject,
       message: message,

src-ui/src/app/services/rest/processed-mail.service.spec.ts

@@ -1,39 +0,0 @@
-import { HttpTestingController } from '@angular/common/http/testing'
-import { TestBed } from '@angular/core/testing'
-import { Subscription } from 'rxjs'
-import { environment } from 'src/environments/environment'
-import { commonAbstractPaperlessServiceTests } from './abstract-paperless-service.spec'
-import { ProcessedMailService } from './processed-mail.service'
-
-let httpTestingController: HttpTestingController
-let service: ProcessedMailService
-let subscription: Subscription
-const endpoint = 'processed_mail'
-
-// run common tests
-commonAbstractPaperlessServiceTests(endpoint, ProcessedMailService)
-
-describe('Additional service tests for ProcessedMailService', () => {
-  beforeEach(() => {
-    // Dont need to setup again
-
-    httpTestingController = TestBed.inject(HttpTestingController)
-    service = TestBed.inject(ProcessedMailService)
-  })
-
-  afterEach(() => {
-    subscription?.unsubscribe()
-    httpTestingController.verify()
-  })
-
-  it('should call appropriate api endpoint for bulk delete', () => {
-    const ids = [1, 2, 3]
-    subscription = service.bulk_delete(ids).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/bulk_delete/`
-    )
-    expect(req.request.method).toEqual('POST')
-    expect(req.request.body).toEqual({ mail_ids: ids })
-    req.flush({})
-  })
-})

src-ui/src/app/services/rest/processed-mail.service.ts

@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core'
-import { ProcessedMail } from 'src/app/data/processed-mail'
-import { AbstractPaperlessService } from './abstract-paperless-service'
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProcessedMailService extends AbstractPaperlessService<ProcessedMail> {
-  constructor() {
-    super()
-    this.resourceName = 'processed_mail'
-  }
-
-  public bulk_delete(mailIds: number[]) {
-    return this.http.post(`${this.getResourceUrl()}bulk_delete/`, {
-      mail_ids: mailIds,
-    })
-  }
-}

src-ui/src/app/services/tasks.service.spec.ts

@@ -51,7 +51,7 @@ describe('TasksService', () => {
   })
 
   it('calls acknowledge_tasks api endpoint on dismiss and reloads', () => {
-    tasksService.dismissTasks(new Set([1, 2, 3])).subscribe()
+    tasksService.dismissTasks(new Set([1, 2, 3]))
     const req = httpTestingController.expectOne(
       `${environment.apiBaseUrl}tasks/acknowledge/`
     )

src-ui/src/app/services/tasks.service.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable, inject } from '@angular/core'
 import { Observable, Subject } from 'rxjs'
-import { first, takeUntil, tap } from 'rxjs/operators'
+import { first, takeUntil } from 'rxjs/operators'
 import {
   PaperlessTask,
   PaperlessTaskName,
@@ -68,17 +68,14 @@ export class TasksService {
   }
 
   public dismissTasks(task_ids: Set<number>) {
-    return this.http
+    this.http
       .post(`${this.baseUrl}tasks/acknowledge/`, {
         tasks: [...task_ids],
       })
-      .pipe(
-        first(),
-        takeUntil(this.unsubscribeNotifer),
-        tap(() => {
-          this.reload()
-        })
-      )
+      .pipe(first())
+      .subscribe((r) => {
+        this.reload()
+      })
   }
 
   public cancelPending(): void {