Add Coveralls for coverage

2025-10-08 02:06:16 -05:00 · 2025-09-26 09:17:53 -07:00
55 changed files with 3495 additions and 6279 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
    steps:
      - name: Check if workflow should run
        id: check
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
@@ -69,7 +69,7 @@ jobs:
      - 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 +84,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 +138,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,13 +183,23 @@ 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: Upload backend coverage to Coveralls
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          file: coverage.xml
+          format: cobertura
+          flag-name: backend-python-${{ matrix.python-version }}
+          parallel: true
      - name: Stop containers
        if: always()
        run: |
@@ -207,7 +217,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 +250,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,13 +273,35 @@ 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/
+      - name: Upload frontend coverage to Coveralls
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          file: src-ui/coverage/lcov.info
+          format: lcov
+          flag-name: frontend-node-${{ matrix.node-version }}-shard-${{ matrix.shard-index }}
+          parallel: true
+  coveralls-finish:
+    name: Finalize Coveralls
+    runs-on: ubuntu-24.04
+    needs:
+      - tests-backend
+      - tests-frontend
+    steps:
+      - name: Mark Coveralls jobs complete
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
  tests-frontend-e2e:
    name: "Frontend E2E Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})"
    runs-on: ubuntu-24.04
@@ -288,7 +320,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 +363,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 +505,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 +653,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 +685,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;
--- a/.github/workflows/cleanup-tags.yml
+++ b/.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
--- a/.github/workflows/pr-bot.yml
+++ b/.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;
--- a/.github/workflows/repo-maintenance.yml
+++ b/.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) {
--- a/.github/workflows/translate-strings.yml
+++ b/.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'
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -49,7 +49,7 @@ repos:
          - 'prettier-plugin-organize-imports@4.1.0'
  # Python hooks
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.2
+    rev: v0.13.0
    hooks:
      - id: ruff-check
      - id: ruff-format
@@ -59,7 +59,7 @@ repos:
      - 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
--- a/2
+++ b/2
@@ -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.8.22-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

--- a/docker/compose/docker-compose.portainer.yml
+++ b/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
--- a/docker/compose/docker-compose.postgres-tika.yml
+++ b/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
--- a/docker/compose/docker-compose.postgres.yml
+++ b/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
--- a/docs/configuration.md
+++ b/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`.
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -414,7 +414,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
@@ -427,7 +427,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
@@ -637,7 +637,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}
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,10 +30,10 @@ dependencies = [
  "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",
@@ -54,6 +54,7 @@ dependencies = [
  "ocrmypdf~=16.11.0",
  "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",
--- a/src-ui/e2e/document-list/document-list.spec.ts
+++ b/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()
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
--- a/src-ui/package.json
+++ b/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",
--- a/src-ui/pnpm-lock.yaml
+++ b/src-ui/pnpm-lock.yaml
--- a/src-ui/setup-jest.ts
+++ b/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')
--- a/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts
+++ b/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]))
--- a/src-ui/src/app/components/admin/tasks/tasks.component.ts
+++ b/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()
    }
  }
--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+++ b/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) {
--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.scss
+++ b/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;
+  }
+}
--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
+++ b/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 &&
--- a/src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html
+++ b/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-conditions mb-3">
-            <div class="d-flex align-items-center">
-              <label class="form-label mb-0" i18n>Conditions</label>
-              <button
-                type="button"
-                class="btn btn-sm btn-outline-primary ms-auto"
-                (click)="addCondition(formGroup)"
-                [disabled]="!canAddCondition(formGroup)"
-              >
-                <i-bs name="plus-circle"></i-bs>&nbsp;<span i18n>Add condition</span>
-              </button>
-            </div>
-            <ul class="mt-2 list-group conditions" formArrayName="conditions">
-              @if (getConditionsFormArray(formGroup).length === 0) {
-                <p class="text-muted small" i18n>No conditions added. Add one to define document filters.</p>
-              }
-              @for (condition of getConditionsFormArray(formGroup).controls; track condition; let conditionIndex = $index) {
-                <li [formGroupName]="conditionIndex" class="list-group-item">
-                  <div class="d-flex align-items-center gap-2">
-                    <div class="w-25">
-                      <pngx-input-select
-                        i18n-title
-                        [items]="getConditionTypeOptions(formGroup, conditionIndex)"
-                        formControlName="type"
-                        [allowNull]="false"
-                      ></pngx-input-select>
-                    </div>
-                    <div class="flex-grow-1">
-                      @if (isTagsCondition(condition.get('type').value)) {
-                        <pngx-input-tags
-                          [allowCreate]="false"
-                          [title]="null"
-                          formControlName="values"
-                        ></pngx-input-tags>
-                      } @else if (
-                        isCustomFieldQueryCondition(condition.get('type').value)
-                      ) {
-                        <pngx-custom-fields-query-dropdown
-                          [selectionModel]="getCustomFieldQueryModel(condition)"
-                          (selectionModelChange)="onCustomFieldQuerySelectionChange(condition, $event)"
-                          [useDropdown]="false"
-                        ></pngx-custom-fields-query-dropdown>
-                        @if (!isCustomFieldQueryValid(condition)) {
-                          <div class="text-danger small" i18n>
-                            Complete the custom field query configuration.
-                          </div>
-                        }
-                      } @else {
-                        <pngx-input-select
-                          [items]="getConditionSelectItems(condition.get('type').value)"
-                          [allowNull]="true"
-                          [multiple]="isSelectMultiple(condition.get('type').value)"
-                          formControlName="values"
-                        ></pngx-input-select>
-                      }
-                    </div>
-                    <button
-                      type="button"
-                      class="btn btn-link text-danger p-0"
-                      (click)="removeCondition(formGroup, conditionIndex)"
-                    >
-                      <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>

--- a/src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.scss
+++ b/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 .conditions .paperless-input-select.mb-3 {
-    margin-bottom: 0 !important;
-}
--- a/src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.spec.ts
+++ b/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,
-  TriggerConditionType,
  WORKFLOW_ACTION_OPTIONS,
  WORKFLOW_TYPE_OPTIONS,
  WorkflowEditDialogComponent,
@@ -383,588 +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 condition builder values into trigger filters on save', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0)
-    component.addCondition(triggerGroup as FormGroup)
-    component.addCondition(triggerGroup as FormGroup)
-    component.addCondition(triggerGroup as FormGroup)
-
-    const conditions = component.getConditionsFormArray(
-      triggerGroup as FormGroup
-    )
-    expect(conditions.length).toBe(3)
-
-    conditions.at(0).get('values').setValue([1])
-    conditions.at(1).get('values').setValue([2, 3])
-    conditions.at(2).get('values').setValue([4])
-
-    const addConditionOfType = (type: TriggerConditionType) => {
-      const newCondition = component.addCondition(triggerGroup as FormGroup)
-      newCondition.get('type').setValue(type)
-      return newCondition
-    }
-
-    const correspondentIs = addConditionOfType(
-      TriggerConditionType.CorrespondentIs
-    )
-    correspondentIs.get('values').setValue(1)
-
-    const correspondentNot = addConditionOfType(
-      TriggerConditionType.CorrespondentNot
-    )
-    correspondentNot.get('values').setValue([1])
-
-    const documentTypeIs = addConditionOfType(
-      TriggerConditionType.DocumentTypeIs
-    )
-    documentTypeIs.get('values').setValue(1)
-
-    const documentTypeNot = addConditionOfType(
-      TriggerConditionType.DocumentTypeNot
-    )
-    documentTypeNot.get('values').setValue([1])
-
-    const storagePathIs = addConditionOfType(TriggerConditionType.StoragePathIs)
-    storagePathIs.get('values').setValue(1)
-
-    const storagePathNot = addConditionOfType(
-      TriggerConditionType.StoragePathNot
-    )
-    storagePathNot.get('values').setValue([1])
-
-    const customFieldCondition = addConditionOfType(
-      TriggerConditionType.CustomFieldQuery
-    )
-    const customFieldQuery = JSON.stringify(['AND', [[1, 'exact', 'test']]])
-    customFieldCondition.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].conditions).toBeUndefined()
-  })
-
-  it('should ignore empty and null condition values when mapping filters', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    const tagsCondition = component.addCondition(triggerGroup)
-    tagsCondition.get('type').setValue(TriggerConditionType.TagsAny)
-    tagsCondition.get('values').setValue([])
-
-    const correspondentCondition = component.addCondition(triggerGroup)
-    correspondentCondition
-      .get('type')
-      .setValue(TriggerConditionType.CorrespondentIs)
-    correspondentCondition.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 addConditionOfType = (type: TriggerConditionType, value: any) => {
-      const condition = component.addCondition(triggerGroup)
-      condition.get('type').setValue(type)
-      condition.get('values').setValue(value)
-    }
-
-    addConditionOfType(TriggerConditionType.CorrespondentIs, [5])
-    addConditionOfType(TriggerConditionType.DocumentTypeIs, [6])
-    addConditionOfType(TriggerConditionType.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 condition values when aggregating filters', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    const setCondition = (type: TriggerConditionType, value: number): void => {
-      const condition = component.addCondition(triggerGroup) as FormGroup
-      condition.get('type').setValue(type)
-      condition.get('values').setValue(value)
-    }
-
-    setCondition(TriggerConditionType.TagsAll, 11)
-    setCondition(TriggerConditionType.TagsNone, 12)
-    setCondition(TriggerConditionType.CorrespondentNot, 13)
-    setCondition(TriggerConditionType.DocumentTypeNot, 14)
-    setCondition(TriggerConditionType.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 condition type options and update disabled state', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-    component.addCondition(triggerGroup)
-
-    const optionsFirst = component.getConditionTypeOptions(triggerGroup, 0)
-    const optionsSecond = component.getConditionTypeOptions(triggerGroup, 0)
-    expect(optionsFirst).toBe(optionsSecond)
-
-    // to force disabled flag
-    component.addCondition(triggerGroup)
-    const conditionArray = component.getConditionsFormArray(triggerGroup)
-    const firstCondition = conditionArray.at(0)
-    firstCondition.get('type').setValue(TriggerConditionType.CorrespondentIs)
-
-    component.addCondition(triggerGroup)
-    const updatedConditions = component.getConditionsFormArray(triggerGroup)
-    const secondCondition = updatedConditions.at(1)
-    const options = component.getConditionTypeOptions(triggerGroup, 1)
-    const correspondentIsOption = options.find(
-      (option) => option.id === TriggerConditionType.CorrespondentIs
-    )
-    expect(correspondentIsOption.disabled).toBe(true)
-
-    firstCondition.get('type').setValue(TriggerConditionType.DocumentTypeNot)
-    secondCondition.get('type').setValue(TriggerConditionType.TagsAll)
-    const postChangeOptions = component.getConditionTypeOptions(triggerGroup, 1)
-    const correspondentOptionAfter = postChangeOptions.find(
-      (option) => option.id === TriggerConditionType.CorrespondentIs
-    )
-    expect(correspondentOptionAfter.disabled).toBe(false)
-  })
-
-  it('should keep multi-entry condition options enabled and allow duplicates', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    component.conditionDefinitions = [
-      {
-        id: TriggerConditionType.TagsAny,
-        name: 'Any tags',
-        inputType: 'tags',
-        allowMultipleEntries: true,
-        allowMultipleValues: true,
-      } as any,
-      {
-        id: TriggerConditionType.CorrespondentIs,
-        name: 'Correspondent is',
-        inputType: 'select',
-        allowMultipleEntries: false,
-        allowMultipleValues: false,
-        selectItems: 'correspondents',
-      } as any,
-    ]
-
-    const firstCondition = component.addCondition(triggerGroup)
-    firstCondition.get('type').setValue(TriggerConditionType.TagsAny)
-
-    const secondCondition = component.addCondition(triggerGroup)
-    expect(secondCondition).not.toBeNull()
-
-    const options = component.getConditionTypeOptions(triggerGroup, 1)
-    const multiEntryOption = options.find(
-      (option) => option.id === TriggerConditionType.TagsAny
-    )
-
-    expect(multiEntryOption.disabled).toBe(false)
-    expect(component.canAddCondition(triggerGroup)).toBe(true)
-  })
-
-  it('should return null when no condition definitions remain available', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    component.conditionDefinitions = [
-      {
-        id: TriggerConditionType.TagsAny,
-        name: 'Any tags',
-        inputType: 'tags',
-        allowMultipleEntries: false,
-        allowMultipleValues: true,
-      } as any,
-      {
-        id: TriggerConditionType.CorrespondentIs,
-        name: 'Correspondent is',
-        inputType: 'select',
-        allowMultipleEntries: false,
-        allowMultipleValues: false,
-        selectItems: 'correspondents',
-      } as any,
-    ]
-
-    const firstCondition = component.addCondition(triggerGroup)
-    firstCondition.get('type').setValue(TriggerConditionType.TagsAny)
-    const secondCondition = component.addCondition(triggerGroup)
-    secondCondition.get('type').setValue(TriggerConditionType.CorrespondentIs)
-
-    expect(component.canAddCondition(triggerGroup)).toBe(false)
-    expect(component.addCondition(triggerGroup)).toBeNull()
-  })
-
-  it('should skip condition definitions without handlers when building form array', () => {
-    const originalDefinitions = component.conditionDefinitions
-    component.conditionDefinitions = [
-      {
-        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 conditions = component['buildConditionFormArray'](trigger)
-    expect(conditions.length).toBe(0)
-
-    component.conditionDefinitions = originalDefinitions
-  })
-
-  it('should return null when adding condition for unknown trigger form group', () => {
-    expect(component.addCondition(new FormGroup({}) as any)).toBeNull()
-  })
-
-  it('should ignore remove condition calls for unknown trigger form group', () => {
-    expect(() =>
-      component.removeCondition(new FormGroup({}) as any, 0)
-    ).not.toThrow()
-  })
-
-  it('should teardown custom field query model when removing a custom field condition', () => {
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    component.addCondition(triggerGroup)
-    const conditions = component.getConditionsFormArray(triggerGroup)
-    const conditionGroup = conditions.at(0) as FormGroup
-    conditionGroup.get('type').setValue(TriggerConditionType.CustomFieldQuery)
-
-    const model = component.getCustomFieldQueryModel(conditionGroup)
-    expect(model).toBeDefined()
-    expect(
-      component['getStoredCustomFieldQueryModel'](conditionGroup as any)
-    ).toBe(model)
-
-    component.removeCondition(triggerGroup, 0)
-    expect(
-      component['getStoredCustomFieldQueryModel'](conditionGroup as any)
-    ).toBeNull()
-  })
-
-  it('should return readable condition names', () => {
-    expect(component.getConditionName(TriggerConditionType.TagsAny)).toBe(
-      'Has any of these tags'
-    )
-    expect(component.getConditionName(999 as any)).toBe('')
-  })
-
-  it('should build condition 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 conditions = component.getConditionsFormArray(triggerGroup)
-    expect(conditions.length).toBe(10)
-    const customFieldCondition = conditions.at(9) as FormGroup
-    expect(customFieldCondition.get('type').value).toBe(
-      TriggerConditionType.CustomFieldQuery
-    )
-    const model = component.getCustomFieldQueryModel(customFieldCondition)
-    expect(model.isValid()).toBe(true)
-  })
-
-  it('should expose select metadata helpers', () => {
-    expect(
-      component.isSelectMultiple(TriggerConditionType.CorrespondentNot)
-    ).toBe(true)
-    expect(
-      component.isSelectMultiple(TriggerConditionType.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.getConditionSelectItems(TriggerConditionType.CorrespondentIs)
-    ).toEqual(component.correspondents)
-    expect(
-      component.getConditionSelectItems(TriggerConditionType.DocumentTypeIs)
-    ).toEqual(component.documentTypes)
-    expect(
-      component.getConditionSelectItems(TriggerConditionType.StoragePathIs)
-    ).toEqual(component.storagePaths)
-    expect(
-      component.getConditionSelectItems(TriggerConditionType.TagsAll)
-    ).toEqual([])
-
-    expect(
-      component.isCustomFieldQueryCondition(
-        TriggerConditionType.CustomFieldQuery
-      )
-    ).toBe(true)
-  })
-
-  it('should return empty select items when definition is missing', () => {
-    const originalDefinitions = component.conditionDefinitions
-    component.conditionDefinitions = []
-
-    expect(
-      component.getConditionSelectItems(TriggerConditionType.CorrespondentIs)
-    ).toEqual([])
-
-    component.conditionDefinitions = originalDefinitions
-  })
-
-  it('should return empty select items when definition has unknown source', () => {
-    const originalDefinitions = component.conditionDefinitions
-    component.conditionDefinitions = [
-      {
-        id: TriggerConditionType.CorrespondentIs,
-        name: 'Correspondent is',
-        inputType: 'select',
-        allowMultipleEntries: false,
-        allowMultipleValues: false,
-        selectItems: 'unknown',
-      } as any,
-    ]
-
-    expect(
-      component.getConditionSelectItems(TriggerConditionType.CorrespondentIs)
-    ).toEqual([])
-
-    component.conditionDefinitions = 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 conditionGroup = new FormGroup({
-      values: new FormControl('not-json'),
-    })
-
-    component['ensureCustomFieldQueryModel'](conditionGroup, 'not-json')
-
-    const model = component['getStoredCustomFieldQueryModel'](
-      conditionGroup as any
-    )
-    expect(model).toBeDefined()
-    expect(model.queries.length).toBeGreaterThan(0)
-
-    const valuesControl = conditionGroup.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'](conditionGroup 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 condition values for single and multi selects', () => {
-    expect(
-      component['normalizeConditionValue'](TriggerConditionType.TagsAny)
-    ).toEqual([])
-    expect(
-      component['normalizeConditionValue'](TriggerConditionType.TagsAny, 5)
-    ).toEqual([5])
-    expect(
-      component['normalizeConditionValue'](TriggerConditionType.TagsAny, [5, 6])
-    ).toEqual([5, 6])
-    expect(
-      component['normalizeConditionValue'](
-        TriggerConditionType.CorrespondentIs,
-        [7]
-      )
-    ).toEqual(7)
-    expect(
-      component['normalizeConditionValue'](
-        TriggerConditionType.CorrespondentIs,
-        8
-      )
-    ).toEqual(8)
-    const customFieldJson = JSON.stringify(['AND', [[1, 'exact', 'test']]])
-    expect(
-      component['normalizeConditionValue'](
-        TriggerConditionType.CustomFieldQuery,
-        customFieldJson
-      )
-    ).toEqual(customFieldJson)
-
-    const customFieldObject = ['AND', [[1, 'exact', 'other']]]
-    expect(
-      component['normalizeConditionValue'](
-        TriggerConditionType.CustomFieldQuery,
-        customFieldObject
-      )
-    ).toEqual(JSON.stringify(customFieldObject))
-
-    expect(
-      component['normalizeConditionValue'](
-        TriggerConditionType.CustomFieldQuery,
-        false
-      )
-    ).toBeNull()
-  })
-
-  it('should add and remove condition form groups', () => {
-    component['changeDetector'] = { detectChanges: jest.fn() } as any
-    component.object = undefined
-    component.addTrigger()
-    const triggerGroup = component.triggerFields.at(0) as FormGroup
-
-    component.addCondition(triggerGroup)
-
-    component.removeCondition(triggerGroup, 0)
-    expect(component.getConditionsFormArray(triggerGroup).length).toBe(0)
-
-    component.addCondition(triggerGroup)
-    const conditionArrayAfterAdd =
-      component.getConditionsFormArray(triggerGroup)
-    conditionArrayAfterAdd
-      .at(0)
-      .get('type')
-      .setValue(TriggerConditionType.TagsAll)
-    expect(component.getConditionsFormArray(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]),
--- a/src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts
+++ b/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,238 +135,10 @@ export const WORKFLOW_ACTION_OPTIONS = [
  },
 ]

-export enum TriggerConditionType {
-  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 TriggerConditionDefinition {
-  id: TriggerConditionType
-  name: string
-  inputType: 'tags' | 'select' | 'customFieldQuery'
-  allowMultipleEntries: boolean
-  allowMultipleValues: boolean
-  selectItems?: 'correspondents' | 'documentTypes' | 'storagePaths'
-  disabled?: boolean
-}
-
-type TriggerConditionOption = TriggerConditionDefinition & {
-  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 ConditionFilterHandler {
-  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 CustomFieldConditionGroup = FormGroup & {
-  [CUSTOM_FIELD_QUERY_MODEL_KEY]?: CustomFieldQueriesModel
-  [CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY]?: Subscription
-}
-
-const TRIGGER_CONDITION_DEFINITIONS: TriggerConditionDefinition[] = [
-  {
-    id: TriggerConditionType.TagsAny,
-    name: $localize`Has any of these tags`,
-    inputType: 'tags',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-  },
-  {
-    id: TriggerConditionType.TagsAll,
-    name: $localize`Has all of these tags`,
-    inputType: 'tags',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-  },
-  {
-    id: TriggerConditionType.TagsNone,
-    name: $localize`Does not have these tags`,
-    inputType: 'tags',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-  },
-  {
-    id: TriggerConditionType.CorrespondentIs,
-    name: $localize`Has correspondent`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: false,
-    selectItems: 'correspondents',
-  },
-  {
-    id: TriggerConditionType.CorrespondentNot,
-    name: $localize`Does not have correspondents`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'correspondents',
-  },
-  {
-    id: TriggerConditionType.DocumentTypeIs,
-    name: $localize`Has document type`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: false,
-    selectItems: 'documentTypes',
-  },
-  {
-    id: TriggerConditionType.DocumentTypeNot,
-    name: $localize`Does not have document types`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'documentTypes',
-  },
-  {
-    id: TriggerConditionType.StoragePathIs,
-    name: $localize`Has storage path`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: false,
-    selectItems: 'storagePaths',
-  },
-  {
-    id: TriggerConditionType.StoragePathNot,
-    name: $localize`Does not have storage paths`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'storagePaths',
-  },
-  {
-    id: TriggerConditionType.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 CONDITION_FILTER_HANDLERS: Record<
-  TriggerConditionType,
-  ConditionFilterHandler
-> = {
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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,
-  },
-  [TriggerConditionType.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',
@@ -387,7 +153,6 @@ const CONDITION_FILTER_HANDLERS: Record<
    TextAreaComponent,
    TagsComponent,
    CustomFieldsValuesComponent,
-    CustomFieldsQueryDropdownComponent,
    PermissionsGroupComponent,
    PermissionsUserComponent,
    ConfirmButtonComponent,
@@ -405,8 +170,6 @@ export class WorkflowEditDialogComponent
 {
  public WorkflowTriggerType = WorkflowTriggerType
  public WorkflowActionType = WorkflowActionType
-  public TriggerConditionType = TriggerConditionType
-  public conditionDefinitions = TRIGGER_CONDITION_DEFINITIONS

  private correspondentService: CorrespondentService
  private documentTypeService: DocumentTypeService
@@ -426,11 +189,6 @@ export class WorkflowEditDialogComponent

  private allowedActionTypes = []

-  private readonly triggerConditionOptionsMap = new WeakMap<
-    FormArray,
-    TriggerConditionOption[]
-  >()
-
  constructor() {
    super()
    this.service = inject(WorkflowService)
@@ -632,424 +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 conditions = this.getConditionsFormArray(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 conditions.controls) {
-            const type = control.get('type').value as TriggerConditionType
-            const values = control.get('values').value
-
-            if (values === null || values === undefined) {
-              continue
-            }
-
-            if (Array.isArray(values) && values.length === 0) {
-              continue
-            }
-
-            const handler = CONDITION_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.conditions
-
-          return trigger
-        }
-      )
-    }
-
-    return formValues
-  }
-
-  public matchingPatternRequired(formGroup: FormGroup): boolean {
-    return formGroup.get('matching_algorithm').value !== MATCH_NONE
-  }
-
-  private createConditionFormGroup(
-    type: TriggerConditionType,
-    initialValue?: any
-  ): FormGroup {
-    const group = new FormGroup({
-      type: new FormControl(type),
-      values: new FormControl(this.normalizeConditionValue(type, initialValue)),
-    })
-
-    group
-      .get('type')
-      .valueChanges.subscribe((newType: TriggerConditionType) => {
-        if (newType === TriggerConditionType.CustomFieldQuery) {
-          this.ensureCustomFieldQueryModel(group)
-        } else {
-          this.clearCustomFieldQueryModel(group)
-          group.get('values').setValue(this.getDefaultConditionValue(newType), {
-            emitEvent: false,
-          })
-        }
-      })
-
-    if (type === TriggerConditionType.CustomFieldQuery) {
-      this.ensureCustomFieldQueryModel(group, initialValue)
-    }
-
-    return group
-  }
-
-  private buildConditionFormArray(trigger: WorkflowTrigger): FormArray {
-    const conditions = new FormArray([])
-
-    for (const definition of this.conditionDefinitions) {
-      const handler = CONDITION_FILTER_HANDLERS[definition.id]
-      if (!handler) {
-        continue
-      }
-
-      const value = handler.extract(trigger)
-      if (!handler.hasValue(value)) {
-        continue
-      }
-
-      conditions.push(this.createConditionFormGroup(definition.id, value))
-    }
-
-    return conditions
-  }
-
-  getConditionsFormArray(formGroup: FormGroup): FormArray {
-    return formGroup.get('conditions') as FormArray
-  }
-
-  getConditionTypeOptions(formGroup: FormGroup, conditionIndex: number) {
-    const conditions = this.getConditionsFormArray(formGroup)
-    const options = this.getConditionTypeOptionsForArray(conditions)
-    const currentType = conditions.at(conditionIndex).get('type')
-      .value as TriggerConditionType
-    const usedTypes = new Set(
-      conditions.controls.map(
-        (control) => control.get('type').value as TriggerConditionType
-      )
-    )
-
-    for (const option of options) {
-      if (option.allowMultipleEntries) {
-        option.disabled = false
-        continue
-      }
-
-      option.disabled = usedTypes.has(option.id) && option.id !== currentType
-    }
-
-    return options
-  }
-
-  canAddCondition(formGroup: FormGroup): boolean {
-    const conditions = this.getConditionsFormArray(formGroup)
-    const usedTypes = new Set(
-      conditions.controls.map(
-        (control) => control.get('type').value as TriggerConditionType
-      )
-    )
-
-    return this.conditionDefinitions.some((definition) => {
-      if (definition.allowMultipleEntries) {
-        return true
-      }
-      return !usedTypes.has(definition.id)
-    })
-  }
-
-  addCondition(triggerFormGroup: FormGroup): FormGroup | null {
-    const triggerIndex = this.triggerFields.controls.indexOf(triggerFormGroup)
-    if (triggerIndex === -1) {
-      return null
-    }
-
-    const conditions = this.getConditionsFormArray(triggerFormGroup)
-
-    const availableDefinition = this.conditionDefinitions.find((definition) => {
-      if (definition.allowMultipleEntries) {
-        return true
-      }
-      return !conditions.controls.some(
-        (control) => control.get('type').value === definition.id
-      )
-    })
-
-    if (!availableDefinition) {
-      return null
-    }
-
-    conditions.push(this.createConditionFormGroup(availableDefinition.id))
-    triggerFormGroup.markAsDirty()
-    triggerFormGroup.markAsTouched()
-
-    return conditions.at(-1) as FormGroup
-  }
-
-  removeCondition(triggerFormGroup: FormGroup, conditionIndex: number) {
-    const triggerIndex = this.triggerFields.controls.indexOf(triggerFormGroup)
-    if (triggerIndex === -1) {
-      return
-    }
-
-    const conditions = this.getConditionsFormArray(triggerFormGroup)
-    const conditionGroup = conditions.at(conditionIndex) as FormGroup
-    if (
-      conditionGroup?.get('type').value ===
-      TriggerConditionType.CustomFieldQuery
-    ) {
-      this.clearCustomFieldQueryModel(conditionGroup)
-    }
-    conditions.removeAt(conditionIndex)
-    triggerFormGroup.markAsDirty()
-    triggerFormGroup.markAsTouched()
-  }
-
-  getConditionDefinition(
-    type: TriggerConditionType
-  ): TriggerConditionDefinition | undefined {
-    return this.conditionDefinitions.find(
-      (definition) => definition.id === type
-    )
-  }
-
-  getConditionName(type: TriggerConditionType): string {
-    return this.getConditionDefinition(type)?.name ?? ''
-  }
-
-  isTagsCondition(type: TriggerConditionType): boolean {
-    return this.getConditionDefinition(type)?.inputType === 'tags'
-  }
-
-  isCustomFieldQueryCondition(type: TriggerConditionType): boolean {
-    return this.getConditionDefinition(type)?.inputType === 'customFieldQuery'
-  }
-
-  isMultiValueCondition(type: TriggerConditionType): boolean {
-    switch (type) {
-      case TriggerConditionType.TagsAny:
-      case TriggerConditionType.TagsAll:
-      case TriggerConditionType.TagsNone:
-      case TriggerConditionType.CorrespondentNot:
-      case TriggerConditionType.DocumentTypeNot:
-      case TriggerConditionType.StoragePathNot:
-        return true
-      default:
-        return false
-    }
-  }
-
-  isSelectMultiple(type: TriggerConditionType): boolean {
-    return !this.isTagsCondition(type) && this.isMultiValueCondition(type)
-  }
-
-  getConditionSelectItems(type: TriggerConditionType) {
-    const definition = this.getConditionDefinition(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 getConditionTypeOptionsForArray(
-    conditions: FormArray
-  ): TriggerConditionOption[] {
-    let cached = this.triggerConditionOptionsMap.get(conditions)
-    if (!cached) {
-      cached = this.conditionDefinitions.map((definition) => ({
-        ...definition,
-        disabled: false,
-      }))
-      this.triggerConditionOptionsMap.set(conditions, cached)
-    }
-    return cached
-  }
-
-  private ensureCustomFieldQueryModel(
-    conditionGroup: FormGroup,
-    initialValue?: any
-  ): CustomFieldQueriesModel {
-    const existingModel = this.getStoredCustomFieldQueryModel(conditionGroup)
-    if (existingModel) {
-      return existingModel
-    }
-
-    const model = new CustomFieldQueriesModel()
-    this.setCustomFieldQueryModel(conditionGroup, model)
-
-    const rawValue =
-      typeof initialValue === 'string'
-        ? initialValue
-        : (conditionGroup.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(conditionGroup, model)
-      })
-    conditionGroup[CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY]?.unsubscribe()
-    conditionGroup[CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY] = subscription
-
-    this.onCustomFieldQueryModelChanged(conditionGroup, model)
-
-    return model
-  }
-
-  private clearCustomFieldQueryModel(conditionGroup: FormGroup) {
-    const group = conditionGroup as CustomFieldConditionGroup
-    group[CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY]?.unsubscribe()
-    delete group[CUSTOM_FIELD_QUERY_SUBSCRIPTION_KEY]
-    delete group[CUSTOM_FIELD_QUERY_MODEL_KEY]
-  }
-
-  private getStoredCustomFieldQueryModel(
-    conditionGroup: FormGroup
-  ): CustomFieldQueriesModel | null {
-    return (
-      (conditionGroup as CustomFieldConditionGroup)[
-        CUSTOM_FIELD_QUERY_MODEL_KEY
-      ] ?? null
-    )
-  }
-
-  private setCustomFieldQueryModel(
-    conditionGroup: FormGroup,
-    model: CustomFieldQueriesModel
-  ) {
-    const group = conditionGroup as CustomFieldConditionGroup
-    group[CUSTOM_FIELD_QUERY_MODEL_KEY] = model
-  }
-
-  private onCustomFieldQueryModelChanged(
-    conditionGroup: FormGroup,
-    model: CustomFieldQueriesModel
-  ) {
-    const control = conditionGroup.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 getDefaultConditionValue(type: TriggerConditionType) {
-    if (type === TriggerConditionType.CustomFieldQuery) {
-      return null
-    }
-    return this.isMultiValueCondition(type) ? [] : null
-  }
-
-  private normalizeConditionValue(type: TriggerConditionType, value?: any) {
-    if (value === undefined || value === null) {
-      return this.getDefaultConditionValue(type)
-    }
-
-    if (type === TriggerConditionType.CustomFieldQuery) {
-      if (typeof value === 'string') {
-        return value
-      }
-      return value ? JSON.stringify(value) : null
-    }
-
-    if (this.isMultiValueCondition(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
@@ -1065,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),
-        conditions: this.buildConditionFormArray(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(
@@ -1188,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,
--- a/src-ui/src/app/components/common/input/color/color.component.html
+++ b/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>
--- a/src-ui/src/app/components/common/input/color/color.component.spec.ts
+++ b/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'
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/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>
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/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"
--- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
@@ -1212,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 })
@@ -1226,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()
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -615,10 +615,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()
      })
  }

--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -1,144 +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>
-        </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>
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss
+++ b/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;
-}
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/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"
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/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,
--- a/src-ui/src/app/data/workflow-trigger.ts
+++ b/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
--- a/src-ui/src/app/services/tasks.service.spec.ts
+++ b/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/`
    )
--- a/src-ui/src/app/services/tasks.service.ts
+++ b/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 {
--- a/src/documents/matching.py
+++ b/src/documents/matching.py
@@ -6,11 +6,8 @@ from fnmatch import fnmatch
 from fnmatch import translate as fnmatch_translate
 from typing import TYPE_CHECKING

-from rest_framework import serializers
-
 from documents.data_models import ConsumableDocument
 from documents.data_models import DocumentSource
-from documents.filters import CustomFieldQueryParser
 from documents.models import Correspondent
 from documents.models import Document
 from documents.models import DocumentType
@@ -363,9 +360,10 @@ def existing_document_matches_workflow(
        )
        trigger_matched = False

-    # Document tags vs trigger has_tags (any of)
-    if trigger.filter_has_tags.all().count() > 0 and (
-        document.tags.filter(
+    # Document tags vs trigger has_tags
+    if (
+        trigger.filter_has_tags.all().count() > 0
+        and document.tags.filter(
            id__in=trigger.filter_has_tags.all().values_list("id"),
        ).count()
        == 0
@@ -376,126 +374,35 @@ def existing_document_matches_workflow(
        )
        trigger_matched = False

-    # Document tags vs trigger has_all_tags (all of)
-    if trigger.filter_has_all_tags.all().count() > 0 and trigger_matched:
-        required_tag_ids = set(
-            trigger.filter_has_all_tags.all().values_list("id", flat=True),
-        )
-        document_tag_ids = set(
-            document.tags.all().values_list("id", flat=True),
-        )
-        missing_tags = required_tag_ids - document_tag_ids
-        if missing_tags:
-            reason = (
-                f"Document tags {document.tags.all()} do not contain all of"
-                f" {trigger.filter_has_all_tags.all()}",
-            )
-            trigger_matched = False
-
-    # Document tags vs trigger has_not_tags (none of)
+    # Document correspondent vs trigger has_correspondent
    if (
-        trigger.filter_has_not_tags.all().count() > 0
-        and trigger_matched
-        and document.tags.filter(
-            id__in=trigger.filter_has_not_tags.all().values_list("id"),
-        ).exists()
+        trigger.filter_has_correspondent is not None
+        and document.correspondent != trigger.filter_has_correspondent
    ):
        reason = (
-            f"Document tags {document.tags.all()} include excluded tags"
-            f" {trigger.filter_has_not_tags.all()}",
+            f"Document correspondent {document.correspondent} does not match {trigger.filter_has_correspondent}",
        )
        trigger_matched = False

-    # Document correspondent vs trigger has_correspondent
-    if trigger_matched:
-        if (
-            trigger.filter_has_correspondent is not None
-            and document.correspondent != trigger.filter_has_correspondent
-        ):
-            reason = (
-                f"Document correspondent {document.correspondent} does not match {trigger.filter_has_correspondent}",
-            )
-            trigger_matched = False
-
-        if (
-            trigger.filter_has_not_correspondents.all().count() > 0
-            and document.correspondent
-            and trigger.filter_has_not_correspondents.filter(
-                id=document.correspondent_id,
-            ).exists()
-        ):
-            reason = (
-                f"Document correspondent {document.correspondent} is excluded by"
-                f" {trigger.filter_has_not_correspondents.all()}",
-            )
-            trigger_matched = False
-
    # Document document_type vs trigger has_document_type
-    if trigger_matched:
-        if (
-            trigger.filter_has_document_type is not None
-            and document.document_type != trigger.filter_has_document_type
-        ):
-            reason = (
-                f"Document doc type {document.document_type} does not match {trigger.filter_has_document_type}",
-            )
-            trigger_matched = False
-
-        if (
-            trigger.filter_has_not_document_types.all().count() > 0
-            and document.document_type
-            and trigger.filter_has_not_document_types.filter(
-                id=document.document_type_id,
-            ).exists()
-        ):
-            reason = (
-                f"Document doc type {document.document_type} is excluded by"
-                f" {trigger.filter_has_not_document_types.all()}",
-            )
-            trigger_matched = False
+    if (
+        trigger.filter_has_document_type is not None
+        and document.document_type != trigger.filter_has_document_type
+    ):
+        reason = (
+            f"Document doc type {document.document_type} does not match {trigger.filter_has_document_type}",
+        )
+        trigger_matched = False

    # Document storage_path vs trigger has_storage_path
-    if trigger_matched:
-        if (
-            trigger.filter_has_storage_path is not None
-            and document.storage_path != trigger.filter_has_storage_path
-        ):
-            reason = (
-                f"Document storage path {document.storage_path} does not match {trigger.filter_has_storage_path}",
-            )
-            trigger_matched = False
-
-        if (
-            trigger.filter_has_not_storage_paths.all().count() > 0
-            and document.storage_path
-            and trigger.filter_has_not_storage_paths.filter(
-                id=document.storage_path_id,
-            ).exists()
-        ):
-            reason = (
-                f"Document storage path {document.storage_path} is excluded by"
-                f" {trigger.filter_has_not_storage_paths.all()}",
-            )
-            trigger_matched = False
-
-    if trigger_matched and trigger.filter_custom_field_query:
-        parser = CustomFieldQueryParser("filter_custom_field_query")
-        try:
-            custom_field_q, annotations = parser.parse(
-                trigger.filter_custom_field_query,
-            )
-        except serializers.ValidationError:
-            reason = "Invalid custom field query configuration"
-            trigger_matched = False
-        else:
-            qs = (
-                Document.objects.filter(id=document.id)
-                .annotate(**annotations)
-                .filter(custom_field_q)
-            )
-            if not qs.exists():
-                reason = "Document custom fields do not match the configured custom field query"
-                trigger_matched = False
+    if (
+        trigger.filter_has_storage_path is not None
+        and document.storage_path != trigger.filter_has_storage_path
+    ):
+        reason = (
+            f"Document storage path {document.storage_path} does not match {trigger.filter_has_storage_path}",
+        )
+        trigger_matched = False

    # Document original_filename vs trigger filename
    if (
@@ -531,57 +438,21 @@ def prefilter_documents_by_workflowtrigger(
            tags__in=trigger.filter_has_tags.all(),
        ).distinct()

-    if trigger.filter_has_all_tags.all().count() > 0:
-        for tag_id in trigger.filter_has_all_tags.all().values_list("id", flat=True):
-            documents = documents.filter(tags__id=tag_id)
-        documents = documents.distinct()
-
-    if trigger.filter_has_not_tags.all().count() > 0:
-        documents = documents.exclude(
-            tags__in=trigger.filter_has_not_tags.all(),
-        ).distinct()
-
    if trigger.filter_has_correspondent is not None:
        documents = documents.filter(
            correspondent=trigger.filter_has_correspondent,
        )

-    if trigger.filter_has_not_correspondents.all().count() > 0:
-        documents = documents.exclude(
-            correspondent__in=trigger.filter_has_not_correspondents.all(),
-        )
-
    if trigger.filter_has_document_type is not None:
        documents = documents.filter(
            document_type=trigger.filter_has_document_type,
        )

-    if trigger.filter_has_not_document_types.all().count() > 0:
-        documents = documents.exclude(
-            document_type__in=trigger.filter_has_not_document_types.all(),
-        )
-
    if trigger.filter_has_storage_path is not None:
        documents = documents.filter(
            storage_path=trigger.filter_has_storage_path,
        )

-    if trigger.filter_has_not_storage_paths.all().count() > 0:
-        documents = documents.exclude(
-            storage_path__in=trigger.filter_has_not_storage_paths.all(),
-        )
-
-    if trigger.filter_custom_field_query:
-        parser = CustomFieldQueryParser("filter_custom_field_query")
-        try:
-            custom_field_q, annotations = parser.parse(
-                trigger.filter_custom_field_query,
-            )
-        except serializers.ValidationError:
-            return documents.none()
-
-        documents = documents.annotate(**annotations).filter(custom_field_q)
-
    if trigger.filter_filename is not None and len(trigger.filter_filename) > 0:
        # the true fnmatch will actually run later so we just want a loose filter here
        regex = fnmatch_translate(trigger.filter_filename).lstrip("^").rstrip("$")
--- a/src/documents/migrations/1072_workflowtrigger_filter_custom_field_query_and_more.py
+++ b/src/documents/migrations/1072_workflowtrigger_filter_custom_field_query_and_more.py
@@ -1,73 +0,0 @@
-# Generated by Django 5.2.6 on 2025-10-07 18:52
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("documents", "1071_tag_tn_ancestors_count_tag_tn_ancestors_pks_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="workflowtrigger",
-            name="filter_custom_field_query",
-            field=models.TextField(
-                blank=True,
-                help_text="JSON-encoded custom field query expression.",
-                null=True,
-                verbose_name="filter custom field query",
-            ),
-        ),
-        migrations.AddField(
-            model_name="workflowtrigger",
-            name="filter_has_all_tags",
-            field=models.ManyToManyField(
-                blank=True,
-                related_name="workflowtriggers_has_all",
-                to="documents.tag",
-                verbose_name="has all of these tag(s)",
-            ),
-        ),
-        migrations.AddField(
-            model_name="workflowtrigger",
-            name="filter_has_not_correspondents",
-            field=models.ManyToManyField(
-                blank=True,
-                related_name="workflowtriggers_has_not_correspondent",
-                to="documents.correspondent",
-                verbose_name="does not have these correspondent(s)",
-            ),
-        ),
-        migrations.AddField(
-            model_name="workflowtrigger",
-            name="filter_has_not_document_types",
-            field=models.ManyToManyField(
-                blank=True,
-                related_name="workflowtriggers_has_not_document_type",
-                to="documents.documenttype",
-                verbose_name="does not have these document type(s)",
-            ),
-        ),
-        migrations.AddField(
-            model_name="workflowtrigger",
-            name="filter_has_not_storage_paths",
-            field=models.ManyToManyField(
-                blank=True,
-                related_name="workflowtriggers_has_not_storage_path",
-                to="documents.storagepath",
-                verbose_name="does not have these storage path(s)",
-            ),
-        ),
-        migrations.AddField(
-            model_name="workflowtrigger",
-            name="filter_has_not_tags",
-            field=models.ManyToManyField(
-                blank=True,
-                related_name="workflowtriggers_has_not",
-                to="documents.tag",
-                verbose_name="does not have these tag(s)",
-            ),
-        ),
-    ]
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -1065,20 +1065,6 @@ class WorkflowTrigger(models.Model):
        verbose_name=_("has these tag(s)"),
    )

-    filter_has_all_tags = models.ManyToManyField(
-        Tag,
-        blank=True,
-        related_name="workflowtriggers_has_all",
-        verbose_name=_("has all of these tag(s)"),
-    )
-
-    filter_has_not_tags = models.ManyToManyField(
-        Tag,
-        blank=True,
-        related_name="workflowtriggers_has_not",
-        verbose_name=_("does not have these tag(s)"),
-    )
-
    filter_has_document_type = models.ForeignKey(
        DocumentType,
        null=True,
@@ -1087,13 +1073,6 @@ class WorkflowTrigger(models.Model):
        verbose_name=_("has this document type"),
    )

-    filter_has_not_document_types = models.ManyToManyField(
-        DocumentType,
-        blank=True,
-        related_name="workflowtriggers_has_not_document_type",
-        verbose_name=_("does not have these document type(s)"),
-    )
-
    filter_has_correspondent = models.ForeignKey(
        Correspondent,
        null=True,
@@ -1102,13 +1081,6 @@ class WorkflowTrigger(models.Model):
        verbose_name=_("has this correspondent"),
    )

-    filter_has_not_correspondents = models.ManyToManyField(
-        Correspondent,
-        blank=True,
-        related_name="workflowtriggers_has_not_correspondent",
-        verbose_name=_("does not have these correspondent(s)"),
-    )
-
    filter_has_storage_path = models.ForeignKey(
        StoragePath,
        null=True,
@@ -1117,20 +1089,6 @@ class WorkflowTrigger(models.Model):
        verbose_name=_("has this storage path"),
    )

-    filter_has_not_storage_paths = models.ManyToManyField(
-        StoragePath,
-        blank=True,
-        related_name="workflowtriggers_has_not_storage_path",
-        verbose_name=_("does not have these storage path(s)"),
-    )
-
-    filter_custom_field_query = models.TextField(
-        _("filter custom field query"),
-        null=True,
-        blank=True,
-        help_text=_("JSON-encoded custom field query expression."),
-    )
-
    schedule_offset_days = models.IntegerField(
        _("schedule offset days"),
        default=0,
--- a/src/documents/permissions.py
+++ b/src/documents/permissions.py
@@ -161,21 +161,3 @@ class PaperlessNotePermissions(BasePermission):
        perms = self.perms_map[request.method]

        return request.user.has_perms(perms)
-
-
-class AcknowledgeTasksPermissions(BasePermission):
-    """
-    Permissions class that checks for model permissions for acknowledging tasks.
-    """
-
-    perms_map = {
-        "POST": ["documents.change_paperlesstask"],
-    }
-
-    def has_permission(self, request, view):
-        if not request.user or not request.user.is_authenticated:  # pragma: no cover
-            return False
-
-        perms = self.perms_map.get(request.method, [])
-
-        return request.user.has_perms(perms)
--- a/src/documents/sanity_checker.py
+++ b/src/documents/sanity_checker.py
@@ -76,9 +76,7 @@ def check_sanity(*, progress=False, scheduled=True) -> SanityCheckMessages:
    messages = SanityCheckMessages()

    present_files = {
-        x.resolve()
-        for x in Path(settings.MEDIA_ROOT).glob("**/*")
-        if not x.is_dir() and x.name not in settings.IGNORABLE_FILES
+        x.resolve() for x in Path(settings.MEDIA_ROOT).glob("**/*") if not x.is_dir()
    }

    lockfile = Path(settings.MEDIA_LOCK).resolve()
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -6,7 +6,6 @@ import re
 from datetime import datetime
 from decimal import Decimal
 from typing import TYPE_CHECKING
-from typing import Literal

 import magic
 from celery import states
@@ -43,7 +42,6 @@ if settings.AUDIT_LOG_ENABLED:

 from documents import bulk_edit
 from documents.data_models import DocumentSource
-from documents.filters import CustomFieldQueryParser
 from documents.models import Correspondent
 from documents.models import CustomField
 from documents.models import CustomFieldInstance
@@ -254,35 +252,6 @@ class OwnedObjectSerializer(
            except KeyError:
                pass

-    def _get_perms(self, obj, codename: str, target: Literal["users", "groups"]):
-        """
-        Get the given permissions from context or from django-guardian.
-
-        :param codename: The permission codename, e.g. 'view' or 'change'
-        :param target: 'users' or 'groups'
-        """
-        key = f"{target}_{codename}_perms"
-        cached = self.context.get(key, {}).get(obj.pk)
-        if cached is not None:
-            return list(cached)
-
-        # Permission not found in the context, get it from guardian
-        if target == "users":
-            return list(
-                get_users_with_perms(
-                    obj,
-                    only_with_perms_in=[f"{codename}_{obj.__class__.__name__.lower()}"],
-                    with_group_users=False,
-                ).values_list("id", flat=True),
-            )
-        else:  # groups
-            return list(
-                get_groups_with_only_permission(
-                    obj,
-                    codename=f"{codename}_{obj.__class__.__name__.lower()}",
-                ).values_list("id", flat=True),
-            )
-
    @extend_schema_field(
        field={
            "type": "object",
@@ -317,14 +286,31 @@ class OwnedObjectSerializer(
        },
    )
    def get_permissions(self, obj) -> dict:
+        view_codename = f"view_{obj.__class__.__name__.lower()}"
+        change_codename = f"change_{obj.__class__.__name__.lower()}"
+
        return {
            "view": {
-                "users": self._get_perms(obj, "view", "users"),
-                "groups": self._get_perms(obj, "view", "groups"),
+                "users": get_users_with_perms(
+                    obj,
+                    only_with_perms_in=[view_codename],
+                    with_group_users=False,
+                ).values_list("id", flat=True),
+                "groups": get_groups_with_only_permission(
+                    obj,
+                    codename=view_codename,
+                ).values_list("id", flat=True),
            },
            "change": {
-                "users": self._get_perms(obj, "change", "users"),
-                "groups": self._get_perms(obj, "change", "groups"),
+                "users": get_users_with_perms(
+                    obj,
+                    only_with_perms_in=[change_codename],
+                    with_group_users=False,
+                ).values_list("id", flat=True),
+                "groups": get_groups_with_only_permission(
+                    obj,
+                    codename=change_codename,
+                ).values_list("id", flat=True),
            },
        }

@@ -2195,12 +2181,6 @@ class WorkflowTriggerSerializer(serializers.ModelSerializer):
            "match",
            "is_insensitive",
            "filter_has_tags",
-            "filter_has_all_tags",
-            "filter_has_not_tags",
-            "filter_custom_field_query",
-            "filter_has_not_correspondents",
-            "filter_has_not_document_types",
-            "filter_has_not_storage_paths",
            "filter_has_correspondent",
            "filter_has_document_type",
            "filter_has_storage_path",
@@ -2226,20 +2206,6 @@ class WorkflowTriggerSerializer(serializers.ModelSerializer):
        ):
            attrs["filter_path"] = None

-        if (
-            "filter_custom_field_query" in attrs
-            and attrs["filter_custom_field_query"] is not None
-            and len(attrs["filter_custom_field_query"]) == 0
-        ):
-            attrs["filter_custom_field_query"] = None
-
-        if (
-            "filter_custom_field_query" in attrs
-            and attrs["filter_custom_field_query"] is not None
-        ):
-            parser = CustomFieldQueryParser("filter_custom_field_query")
-            parser.parse(attrs["filter_custom_field_query"])
-
        trigger_type = attrs.get("type", getattr(self.instance, "type", None))
        if (
            trigger_type == WorkflowTrigger.WorkflowTriggerType.CONSUMPTION
@@ -2435,20 +2401,6 @@ class WorkflowSerializer(serializers.ModelSerializer):
        if triggers is not None and triggers is not serializers.empty:
            for trigger in triggers:
                filter_has_tags = trigger.pop("filter_has_tags", None)
-                filter_has_all_tags = trigger.pop("filter_has_all_tags", None)
-                filter_has_not_tags = trigger.pop("filter_has_not_tags", None)
-                filter_has_not_correspondents = trigger.pop(
-                    "filter_has_not_correspondents",
-                    None,
-                )
-                filter_has_not_document_types = trigger.pop(
-                    "filter_has_not_document_types",
-                    None,
-                )
-                filter_has_not_storage_paths = trigger.pop(
-                    "filter_has_not_storage_paths",
-                    None,
-                )
                # Convert sources to strings to handle django-multiselectfield v1.0 changes
                WorkflowTriggerSerializer.normalize_workflow_trigger_sources(trigger)
                trigger_instance, _ = WorkflowTrigger.objects.update_or_create(
@@ -2457,22 +2409,6 @@ class WorkflowSerializer(serializers.ModelSerializer):
                )
                if filter_has_tags is not None:
                    trigger_instance.filter_has_tags.set(filter_has_tags)
-                if filter_has_all_tags is not None:
-                    trigger_instance.filter_has_all_tags.set(filter_has_all_tags)
-                if filter_has_not_tags is not None:
-                    trigger_instance.filter_has_not_tags.set(filter_has_not_tags)
-                if filter_has_not_correspondents is not None:
-                    trigger_instance.filter_has_not_correspondents.set(
-                        filter_has_not_correspondents,
-                    )
-                if filter_has_not_document_types is not None:
-                    trigger_instance.filter_has_not_document_types.set(
-                        filter_has_not_document_types,
-                    )
-                if filter_has_not_storage_paths is not None:
-                    trigger_instance.filter_has_not_storage_paths.set(
-                        filter_has_not_storage_paths,
-                    )
                set_triggers.append(trigger_instance)

        if actions is not None and actions is not serializers.empty:
--- a/src/documents/tests/test_api_tasks.py
+++ b/src/documents/tests/test_api_tasks.py
@@ -135,44 +135,6 @@ class TestTasks(DirectoriesMixin, APITestCase):
        response = self.client.get(self.ENDPOINT + "?acknowledged=false")
        self.assertEqual(len(response.data), 0)

-    def test_acknowledge_tasks_requires_change_permission(self):
-        """
-        GIVEN:
-            - A regular user initially without change permissions
-            - A regular user with change permissions
-        WHEN:
-            - API call is made to acknowledge tasks
-        THEN:
-            - The first user is forbidden from acknowledging tasks
-            - The second user is allowed to acknowledge tasks
-        """
-        regular_user = User.objects.create_user(username="test")
-        self.client.force_authenticate(user=regular_user)
-
-        task = PaperlessTask.objects.create(
-            task_id=str(uuid.uuid4()),
-            task_file_name="task_one.pdf",
-        )
-
-        response = self.client.post(
-            self.ENDPOINT + "acknowledge/",
-            {"tasks": [task.id]},
-        )
-        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-
-        regular_user2 = User.objects.create_user(username="test2")
-        regular_user2.user_permissions.add(
-            Permission.objects.get(codename="change_paperlesstask"),
-        )
-        regular_user2.save()
-        self.client.force_authenticate(user=regular_user2)
-
-        response = self.client.post(
-            self.ENDPOINT + "acknowledge/",
-            {"tasks": [task.id]},
-        )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
    def test_tasks_owner_aware(self):
        """
        GIVEN:
--- a/src/documents/tests/test_api_workflows.py
+++ b/src/documents/tests/test_api_workflows.py
@@ -184,17 +184,6 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
                            "filter_filename": "*",
                            "filter_path": "*/samples/*",
                            "filter_has_tags": [self.t1.id],
-                            "filter_has_all_tags": [self.t2.id],
-                            "filter_has_not_tags": [self.t3.id],
-                            "filter_has_not_correspondents": [self.c2.id],
-                            "filter_has_not_document_types": [self.dt2.id],
-                            "filter_has_not_storage_paths": [self.sp2.id],
-                            "filter_custom_field_query": json.dumps(
-                                [
-                                    "AND",
-                                    [[self.cf1.id, "exact", "value"]],
-                                ],
-                            ),
                            "filter_has_document_type": self.dt.id,
                            "filter_has_correspondent": self.c.id,
                            "filter_has_storage_path": self.sp.id,
@@ -234,36 +223,6 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
        )
        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
        self.assertEqual(Workflow.objects.count(), 2)
-        workflow = Workflow.objects.get(name="Workflow 2")
-        trigger = workflow.triggers.first()
-        self.assertSetEqual(
-            set(trigger.filter_has_tags.values_list("id", flat=True)),
-            {self.t1.id},
-        )
-        self.assertSetEqual(
-            set(trigger.filter_has_all_tags.values_list("id", flat=True)),
-            {self.t2.id},
-        )
-        self.assertSetEqual(
-            set(trigger.filter_has_not_tags.values_list("id", flat=True)),
-            {self.t3.id},
-        )
-        self.assertSetEqual(
-            set(trigger.filter_has_not_correspondents.values_list("id", flat=True)),
-            {self.c2.id},
-        )
-        self.assertSetEqual(
-            set(trigger.filter_has_not_document_types.values_list("id", flat=True)),
-            {self.dt2.id},
-        )
-        self.assertSetEqual(
-            set(trigger.filter_has_not_storage_paths.values_list("id", flat=True)),
-            {self.sp2.id},
-        )
-        self.assertEqual(
-            trigger.filter_custom_field_query,
-            json.dumps(["AND", [[self.cf1.id, "exact", "value"]]]),
-        )

    def test_api_create_invalid_workflow_trigger(self):
        """
@@ -417,14 +376,6 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
                        {
                            "type": WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
                            "filter_has_tags": [self.t1.id],
-                            "filter_has_all_tags": [self.t2.id],
-                            "filter_has_not_tags": [self.t3.id],
-                            "filter_has_not_correspondents": [self.c2.id],
-                            "filter_has_not_document_types": [self.dt2.id],
-                            "filter_has_not_storage_paths": [self.sp2.id],
-                            "filter_custom_field_query": json.dumps(
-                                ["AND", [[self.cf1.id, "exact", "value"]]],
-                            ),
                            "filter_has_correspondent": self.c.id,
                            "filter_has_document_type": self.dt.id,
                        },
@@ -442,30 +393,6 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
        workflow = Workflow.objects.get(id=response.data["id"])
        self.assertEqual(workflow.name, "Workflow Updated")
        self.assertEqual(workflow.triggers.first().filter_has_tags.first(), self.t1)
-        self.assertEqual(
-            workflow.triggers.first().filter_has_all_tags.first(),
-            self.t2,
-        )
-        self.assertEqual(
-            workflow.triggers.first().filter_has_not_tags.first(),
-            self.t3,
-        )
-        self.assertEqual(
-            workflow.triggers.first().filter_has_not_correspondents.first(),
-            self.c2,
-        )
-        self.assertEqual(
-            workflow.triggers.first().filter_has_not_document_types.first(),
-            self.dt2,
-        )
-        self.assertEqual(
-            workflow.triggers.first().filter_has_not_storage_paths.first(),
-            self.sp2,
-        )
-        self.assertEqual(
-            workflow.triggers.first().filter_custom_field_query,
-            json.dumps(["AND", [[self.cf1.id, "exact", "value"]]]),
-        )
        self.assertEqual(workflow.actions.first().assign_title, "Action New Title")

    def test_api_update_workflow_no_trigger_actions(self):
--- a/src/documents/tests/test_sanity_check.py
+++ b/src/documents/tests/test_sanity_check.py
@@ -169,13 +169,6 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
        messages = check_sanity()
        self.assertFalse(messages.has_warning)

-    def test_ignore_ignorable_files(self):
-        self.make_test_data()
-        Path(self.dirs.media_dir, ".DS_Store").touch()
-        Path(self.dirs.media_dir, "desktop.ini").touch()
-        messages = check_sanity()
-        self.assertFalse(messages.has_warning)
-
    def test_archive_filename_no_checksum(self):
        doc = self.make_test_data()
        doc.archive_checksum = None
--- a/src/documents/tests/test_views.py
+++ b/src/documents/tests/test_views.py
@@ -1,23 +1,17 @@
-import json
 import tempfile
 from datetime import timedelta
 from pathlib import Path

 from django.conf import settings
-from django.contrib.auth.models import Group
 from django.contrib.auth.models import Permission
 from django.contrib.auth.models import User
-from django.db import connection
 from django.test import TestCase
 from django.test import override_settings
-from django.test.utils import CaptureQueriesContext
 from django.utils import timezone
-from guardian.shortcuts import assign_perm
 from rest_framework import status

 from documents.models import Document
 from documents.models import ShareLink
-from documents.models import Tag
 from documents.tests.utils import DirectoriesMixin
 from paperless.models import ApplicationConfiguration

@@ -160,113 +154,3 @@ class TestViews(DirectoriesMixin, TestCase):
        response.render()
        self.assertEqual(response.request["PATH_INFO"], "/accounts/login/")
        self.assertContains(response, b"Share link has expired")
-
-    def test_list_with_full_permissions(self):
-        """
-        GIVEN:
-            - Tags with different permissions
-        WHEN:
-            - Request to get tag list with full permissions is made
-        THEN:
-            - Tag list is returned with the right permission information
-        """
-        user2 = User.objects.create(username="user2")
-        user3 = User.objects.create(username="user3")
-        group1 = Group.objects.create(name="group1")
-        group2 = Group.objects.create(name="group2")
-        group3 = Group.objects.create(name="group3")
-        t1 = Tag.objects.create(name="invoice", pk=1)
-        assign_perm("view_tag", self.user, t1)
-        assign_perm("view_tag", user2, t1)
-        assign_perm("view_tag", user3, t1)
-        assign_perm("view_tag", group1, t1)
-        assign_perm("view_tag", group2, t1)
-        assign_perm("view_tag", group3, t1)
-        assign_perm("change_tag", self.user, t1)
-        assign_perm("change_tag", user2, t1)
-        assign_perm("change_tag", group1, t1)
-        assign_perm("change_tag", group2, t1)
-
-        Tag.objects.create(name="bank statement", pk=2)
-        d1 = Document.objects.create(
-            title="Invoice 1",
-            content="This is the invoice of a very expensive item",
-            checksum="A",
-        )
-        d1.tags.add(t1)
-        d2 = Document.objects.create(
-            title="Invoice 2",
-            content="Internet invoice, I should pay it to continue contributing",
-            checksum="B",
-        )
-        d2.tags.add(t1)
-
-        view_permissions = Permission.objects.filter(
-            codename__contains="view_tag",
-        )
-        self.user.user_permissions.add(*view_permissions)
-        self.user.save()
-
-        self.client.force_login(self.user)
-        response = self.client.get("/api/tags/?page=1&full_perms=true")
-        results = json.loads(response.content)["results"]
-        for tag in results:
-            if tag["name"] == "invoice":
-                assert tag["permissions"] == {
-                    "view": {
-                        "users": [self.user.pk, user2.pk, user3.pk],
-                        "groups": [group1.pk, group2.pk, group3.pk],
-                    },
-                    "change": {
-                        "users": [self.user.pk, user2.pk],
-                        "groups": [group1.pk, group2.pk],
-                    },
-                }
-            elif tag["name"] == "bank statement":
-                assert tag["permissions"] == {
-                    "view": {"users": [], "groups": []},
-                    "change": {"users": [], "groups": []},
-                }
-            else:
-                assert False, f"Unexpected tag found: {tag['name']}"
-
-    def test_list_no_n_plus_1_queries(self):
-        """
-        GIVEN:
-            - Tags with different permissions
-        WHEN:
-            - Request to get tag list with full permissions is made
-        THEN:
-            - Permissions are not queried in database tag by tag,
-             i.e. there are no N+1 queries
-        """
-        view_permissions = Permission.objects.filter(
-            codename__contains="view_tag",
-        )
-        self.user.user_permissions.add(*view_permissions)
-        self.user.save()
-        self.client.force_login(self.user)
-
-        # Start by a small list, and count the number of SQL queries
-        for i in range(2):
-            Tag.objects.create(name=f"tag_{i}")
-
-        with CaptureQueriesContext(connection) as ctx_small:
-            response_small = self.client.get("/api/tags/?full_perms=true")
-            assert response_small.status_code == 200
-        num_queries_small = len(ctx_small.captured_queries)
-
-        # Complete the list, and count the number of SQL queries again
-        for i in range(2, 50):
-            Tag.objects.create(name=f"tag_{i}")
-
-        with CaptureQueriesContext(connection) as ctx_large:
-            response_large = self.client.get("/api/tags/?full_perms=true")
-            assert response_large.status_code == 200
-        num_queries_large = len(ctx_large.captured_queries)
-
-        # A few additional queries are allowed, but not a linear explosion
-        assert num_queries_large <= num_queries_small + 5, (
-            f"Possible N+1 queries detected: {num_queries_small} queries for 2 tags, "
-            f"but {num_queries_large} queries for 50 tags"
-        )
--- a/src/documents/tests/test_workflows.py
+++ b/src/documents/tests/test_workflows.py
@@ -1,5 +1,4 @@
 import datetime
-import json
 import shutil
 import socket
 from datetime import timedelta
@@ -32,7 +31,6 @@ from documents import tasks
 from documents.data_models import ConsumableDocument
 from documents.data_models import DocumentSource
 from documents.matching import document_matches_workflow
-from documents.matching import existing_document_matches_workflow
 from documents.matching import prefilter_documents_by_workflowtrigger
 from documents.models import Correspondent
 from documents.models import CustomField
@@ -48,7 +46,6 @@ from documents.models import WorkflowActionEmail
 from documents.models import WorkflowActionWebhook
 from documents.models import WorkflowRun
 from documents.models import WorkflowTrigger
-from documents.serialisers import WorkflowTriggerSerializer
 from documents.signals import document_consumption_finished
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import DummyProgressManager
@@ -1086,406 +1083,6 @@ class TestWorkflows(
            expected_str = f"Document tags {doc.tags.all()} do not include {trigger.filter_has_tags.all()}"
            self.assertIn(expected_str, cm.output[1])

-    def test_document_added_no_match_all_tags(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-        )
-        trigger.filter_has_all_tags.set([self.t1, self.t2])
-        action = WorkflowAction.objects.create(
-            assign_title="Doc assign owner",
-            assign_owner=self.user2,
-        )
-        w = Workflow.objects.create(
-            name="Workflow 1",
-            order=0,
-        )
-        w.triggers.add(trigger)
-        w.actions.add(action)
-        w.save()
-
-        doc = Document.objects.create(
-            title="sample test",
-            correspondent=self.c,
-            original_filename="sample.pdf",
-        )
-        doc.tags.set([self.t1])
-        doc.save()
-
-        with self.assertLogs("paperless.matching", level="DEBUG") as cm:
-            document_consumption_finished.send(
-                sender=self.__class__,
-                document=doc,
-            )
-            expected_str = f"Document did not match {w}"
-            self.assertIn(expected_str, cm.output[0])
-            expected_str = (
-                f"Document tags {doc.tags.all()} do not contain all of"
-                f" {trigger.filter_has_all_tags.all()}"
-            )
-            self.assertIn(expected_str, cm.output[1])
-
-    def test_document_added_excluded_tags(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-        )
-        trigger.filter_has_not_tags.set([self.t3])
-        action = WorkflowAction.objects.create(
-            assign_title="Doc assign owner",
-            assign_owner=self.user2,
-        )
-        w = Workflow.objects.create(
-            name="Workflow 1",
-            order=0,
-        )
-        w.triggers.add(trigger)
-        w.actions.add(action)
-        w.save()
-
-        doc = Document.objects.create(
-            title="sample test",
-            correspondent=self.c,
-            original_filename="sample.pdf",
-        )
-        doc.tags.set([self.t3])
-        doc.save()
-
-        with self.assertLogs("paperless.matching", level="DEBUG") as cm:
-            document_consumption_finished.send(
-                sender=self.__class__,
-                document=doc,
-            )
-            expected_str = f"Document did not match {w}"
-            self.assertIn(expected_str, cm.output[0])
-            expected_str = (
-                f"Document tags {doc.tags.all()} include excluded tags"
-                f" {trigger.filter_has_not_tags.all()}"
-            )
-            self.assertIn(expected_str, cm.output[1])
-
-    def test_document_added_excluded_correspondent(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-        )
-        trigger.filter_has_not_correspondents.set([self.c])
-        action = WorkflowAction.objects.create(
-            assign_title="Doc assign owner",
-            assign_owner=self.user2,
-        )
-        w = Workflow.objects.create(
-            name="Workflow 1",
-            order=0,
-        )
-        w.triggers.add(trigger)
-        w.actions.add(action)
-        w.save()
-
-        doc = Document.objects.create(
-            title="sample test",
-            correspondent=self.c,
-            original_filename="sample.pdf",
-        )
-
-        with self.assertLogs("paperless.matching", level="DEBUG") as cm:
-            document_consumption_finished.send(
-                sender=self.__class__,
-                document=doc,
-            )
-            expected_str = f"Document did not match {w}"
-            self.assertIn(expected_str, cm.output[0])
-            expected_str = (
-                f"Document correspondent {doc.correspondent} is excluded by"
-                f" {trigger.filter_has_not_correspondents.all()}"
-            )
-            self.assertIn(expected_str, cm.output[1])
-
-    def test_document_added_excluded_document_types(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-        )
-        trigger.filter_has_not_document_types.set([self.dt])
-        action = WorkflowAction.objects.create(
-            assign_title="Doc assign owner",
-            assign_owner=self.user2,
-        )
-        w = Workflow.objects.create(
-            name="Workflow 1",
-            order=0,
-        )
-        w.triggers.add(trigger)
-        w.actions.add(action)
-        w.save()
-
-        doc = Document.objects.create(
-            title="sample test",
-            document_type=self.dt,
-            original_filename="sample.pdf",
-        )
-
-        with self.assertLogs("paperless.matching", level="DEBUG") as cm:
-            document_consumption_finished.send(
-                sender=self.__class__,
-                document=doc,
-            )
-            expected_str = f"Document did not match {w}"
-            self.assertIn(expected_str, cm.output[0])
-            expected_str = (
-                f"Document doc type {doc.document_type} is excluded by"
-                f" {trigger.filter_has_not_document_types.all()}"
-            )
-            self.assertIn(expected_str, cm.output[1])
-
-    def test_document_added_excluded_storage_paths(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-        )
-        trigger.filter_has_not_storage_paths.set([self.sp])
-        action = WorkflowAction.objects.create(
-            assign_title="Doc assign owner",
-            assign_owner=self.user2,
-        )
-        w = Workflow.objects.create(
-            name="Workflow 1",
-            order=0,
-        )
-        w.triggers.add(trigger)
-        w.actions.add(action)
-        w.save()
-
-        doc = Document.objects.create(
-            title="sample test",
-            storage_path=self.sp,
-            original_filename="sample.pdf",
-        )
-
-        with self.assertLogs("paperless.matching", level="DEBUG") as cm:
-            document_consumption_finished.send(
-                sender=self.__class__,
-                document=doc,
-            )
-            expected_str = f"Document did not match {w}"
-            self.assertIn(expected_str, cm.output[0])
-            expected_str = (
-                f"Document storage path {doc.storage_path} is excluded by"
-                f" {trigger.filter_has_not_storage_paths.all()}"
-            )
-            self.assertIn(expected_str, cm.output[1])
-
-    def test_document_added_custom_field_query_no_match(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-            filter_custom_field_query=json.dumps(
-                [
-                    "AND",
-                    [[self.cf1.id, "exact", "expected"]],
-                ],
-            ),
-        )
-        action = WorkflowAction.objects.create(
-            assign_title="Doc assign owner",
-            assign_owner=self.user2,
-        )
-        workflow = Workflow.objects.create(name="Workflow 1", order=0)
-        workflow.triggers.add(trigger)
-        workflow.actions.add(action)
-        workflow.save()
-
-        doc = Document.objects.create(
-            title="sample test",
-            correspondent=self.c,
-            original_filename="sample.pdf",
-        )
-        CustomFieldInstance.objects.create(
-            document=doc,
-            field=self.cf1,
-            value_text="other",
-        )
-
-        with self.assertLogs("paperless.matching", level="DEBUG") as cm:
-            document_consumption_finished.send(
-                sender=self.__class__,
-                document=doc,
-            )
-            expected_str = f"Document did not match {workflow}"
-            self.assertIn(expected_str, cm.output[0])
-            self.assertIn(
-                "Document custom fields do not match the configured custom field query",
-                cm.output[1],
-            )
-
-    def test_document_added_custom_field_query_match(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-            filter_custom_field_query=json.dumps(
-                [
-                    "AND",
-                    [[self.cf1.id, "exact", "expected"]],
-                ],
-            ),
-        )
-        doc = Document.objects.create(
-            title="sample test",
-            correspondent=self.c,
-            original_filename="sample.pdf",
-        )
-        CustomFieldInstance.objects.create(
-            document=doc,
-            field=self.cf1,
-            value_text="expected",
-        )
-
-        matched, reason = existing_document_matches_workflow(doc, trigger)
-        self.assertTrue(matched)
-        self.assertEqual(reason, "")
-
-    def test_prefilter_documents_custom_field_query(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-            filter_custom_field_query=json.dumps(
-                [
-                    "AND",
-                    [[self.cf1.id, "exact", "match"]],
-                ],
-            ),
-        )
-        doc1 = Document.objects.create(
-            title="doc 1",
-            correspondent=self.c,
-            original_filename="doc1.pdf",
-            checksum="checksum1",
-        )
-        CustomFieldInstance.objects.create(
-            document=doc1,
-            field=self.cf1,
-            value_text="match",
-        )
-
-        doc2 = Document.objects.create(
-            title="doc 2",
-            correspondent=self.c,
-            original_filename="doc2.pdf",
-            checksum="checksum2",
-        )
-        CustomFieldInstance.objects.create(
-            document=doc2,
-            field=self.cf1,
-            value_text="different",
-        )
-
-        filtered = prefilter_documents_by_workflowtrigger(
-            Document.objects.all(),
-            trigger,
-        )
-        self.assertIn(doc1, filtered)
-        self.assertNotIn(doc2, filtered)
-
-    def test_consumption_trigger_requires_filter_configuration(self):
-        serializer = WorkflowTriggerSerializer(
-            data={
-                "type": WorkflowTrigger.WorkflowTriggerType.CONSUMPTION,
-            },
-        )
-
-        self.assertFalse(serializer.is_valid())
-        errors = serializer.errors.get("non_field_errors", [])
-        self.assertIn(
-            "File name, path or mail rule filter are required",
-            [str(error) for error in errors],
-        )
-
-    def test_workflow_trigger_serializer_clears_empty_custom_field_query(self):
-        serializer = WorkflowTriggerSerializer(
-            data={
-                "type": WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-                "filter_custom_field_query": "",
-            },
-        )
-
-        self.assertTrue(serializer.is_valid(), serializer.errors)
-        self.assertIsNone(serializer.validated_data.get("filter_custom_field_query"))
-
-    def test_existing_document_invalid_custom_field_query_configuration(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-            filter_custom_field_query="{ not json",
-        )
-
-        document = Document.objects.create(
-            title="doc invalid query",
-            original_filename="invalid.pdf",
-            checksum="checksum-invalid-query",
-        )
-
-        matched, reason = existing_document_matches_workflow(document, trigger)
-        self.assertFalse(matched)
-        self.assertEqual(reason, "Invalid custom field query configuration")
-
-    def test_prefilter_documents_returns_none_for_invalid_custom_field_query(self):
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-            filter_custom_field_query="{ not json",
-        )
-
-        Document.objects.create(
-            title="doc",
-            original_filename="doc.pdf",
-            checksum="checksum-prefilter-invalid",
-        )
-
-        filtered = prefilter_documents_by_workflowtrigger(
-            Document.objects.all(),
-            trigger,
-        )
-
-        self.assertEqual(list(filtered), [])
-
-    def test_prefilter_documents_applies_all_filters(self):
-        other_document_type = DocumentType.objects.create(name="Other Type")
-        other_storage_path = StoragePath.objects.create(
-            name="Blocked path",
-            path="/blocked/",
-        )
-
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-            filter_has_correspondent=self.c,
-            filter_has_document_type=self.dt,
-            filter_has_storage_path=self.sp,
-        )
-        trigger.filter_has_tags.set([self.t1])
-        trigger.filter_has_all_tags.set([self.t1, self.t2])
-        trigger.filter_has_not_tags.set([self.t3])
-        trigger.filter_has_not_correspondents.set([self.c2])
-        trigger.filter_has_not_document_types.set([other_document_type])
-        trigger.filter_has_not_storage_paths.set([other_storage_path])
-
-        allowed_document = Document.objects.create(
-            title="allowed",
-            correspondent=self.c,
-            document_type=self.dt,
-            storage_path=self.sp,
-            original_filename="allow.pdf",
-            checksum="checksum-prefilter-allowed",
-        )
-        allowed_document.tags.set([self.t1, self.t2])
-
-        blocked_document = Document.objects.create(
-            title="blocked",
-            correspondent=self.c2,
-            document_type=other_document_type,
-            storage_path=other_storage_path,
-            original_filename="block.pdf",
-            checksum="checksum-prefilter-blocked",
-        )
-        blocked_document.tags.set([self.t1, self.t3])
-
-        filtered = prefilter_documents_by_workflowtrigger(
-            Document.objects.all(),
-            trigger,
-        )
-
-        self.assertIn(allowed_document, filtered)
-        self.assertNotIn(blocked_document, filtered)
-
    def test_document_added_no_match_doctype(self):
        trigger = WorkflowTrigger.objects.create(
            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -5,11 +5,9 @@ import platform
 import re
 import tempfile
 import zipfile
-from collections import defaultdict
 from datetime import datetime
 from pathlib import Path
 from time import mktime
-from typing import Literal
 from unicodedata import normalize
 from urllib.parse import quote
 from urllib.parse import urlparse
@@ -21,7 +19,6 @@ from celery import states
 from django.conf import settings
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import User
-from django.contrib.contenttypes.models import ContentType
 from django.db import connections
 from django.db.migrations.loader import MigrationLoader
 from django.db.migrations.recorder import MigrationRecorder
@@ -59,8 +56,6 @@ from drf_spectacular.utils import OpenApiParameter
 from drf_spectacular.utils import extend_schema
 from drf_spectacular.utils import extend_schema_view
 from drf_spectacular.utils import inline_serializer
-from guardian.utils import get_group_obj_perms_model
-from guardian.utils import get_user_obj_perms_model
 from langdetect import detect
 from packaging import version as packaging_version
 from redis import Redis
@@ -136,7 +131,6 @@ from documents.models import WorkflowAction
 from documents.models import WorkflowTrigger
 from documents.parsers import get_parser_class_for_mime_type
 from documents.parsers import parse_date_generator
-from documents.permissions import AcknowledgeTasksPermissions
 from documents.permissions import PaperlessAdminPermissions
 from documents.permissions import PaperlessNotePermissions
 from documents.permissions import PaperlessObjectPermissions
@@ -260,104 +254,7 @@ class PassUserMixin(GenericAPIView):
        return super().get_serializer(*args, **kwargs)


-class BulkPermissionMixin:
-    """
-    Prefetch Django-Guardian permissions for a list before serialization, to avoid N+1 queries.
-    """
-
-    def _get_object_perms(
-        self,
-        objects: list,
-        perm_codenames: list[str],
-        actor: Literal["users", "groups"],
-    ) -> dict[int, dict[str, list[int]]]:
-        """
-        Collect object-level permissions for either users or groups.
-        """
-        model = self.queryset.model
-        obj_perm_model = (
-            get_user_obj_perms_model(model)
-            if actor == "users"
-            else get_group_obj_perms_model(model)
-        )
-        id_field = "user_id" if actor == "users" else "group_id"
-        ctype = ContentType.objects.get_for_model(model)
-        object_pks = [obj.pk for obj in objects]
-
-        perms_qs = obj_perm_model.objects.filter(
-            content_type=ctype,
-            object_pk__in=object_pks,
-            permission__codename__in=perm_codenames,
-        ).values_list("object_pk", id_field, "permission__codename")
-
-        perms: dict[int, dict[str, list[int]]] = defaultdict(lambda: defaultdict(list))
-        for object_pk, actor_id, codename in perms_qs:
-            perms[int(object_pk)][codename].append(actor_id)
-
-        # Ensure that all objects have all codenames, even if empty
-        for pk in object_pks:
-            for codename in perm_codenames:
-                perms[pk][codename]
-
-        return perms
-
-    def get_serializer_context(self):
-        """
-        Get all permissions of the current list of objects at once and pass them to the serializer.
-        This avoid fetching permissions object by object in database.
-        """
-        context = super().get_serializer_context()
-        try:
-            full_perms = get_boolean(
-                str(self.request.query_params.get("full_perms", "false")),
-            )
-        except ValueError:
-            full_perms = False
-
-        if not full_perms:
-            return context
-
-        # Check which objects are being paginated
-        page = getattr(self, "paginator", None)
-        if page and hasattr(page, "page"):
-            queryset = page.page.object_list
-        elif hasattr(self, "page"):
-            queryset = self.page
-        else:
-            queryset = self.filter_queryset(self.get_queryset())
-
-        model_name = self.queryset.model.__name__.lower()
-        permission_name_view = f"view_{model_name}"
-        permission_name_change = f"change_{model_name}"
-
-        user_perms = self._get_object_perms(
-            objects=queryset,
-            perm_codenames=[permission_name_view, permission_name_change],
-            actor="users",
-        )
-        group_perms = self._get_object_perms(
-            objects=queryset,
-            perm_codenames=[permission_name_view, permission_name_change],
-            actor="groups",
-        )
-
-        context["users_view_perms"] = {
-            pk: user_perms[pk][permission_name_view] for pk in user_perms
-        }
-        context["users_change_perms"] = {
-            pk: user_perms[pk][permission_name_change] for pk in user_perms
-        }
-        context["groups_view_perms"] = {
-            pk: group_perms[pk][permission_name_view] for pk in group_perms
-        }
-        context["groups_change_perms"] = {
-            pk: group_perms[pk][permission_name_change] for pk in group_perms
-        }
-
-        return context
-
-
-class PermissionsAwareDocumentCountMixin(BulkPermissionMixin, PassUserMixin):
+class PermissionsAwareDocumentCountMixin(PassUserMixin):
    """
    Mixin to add document count to queryset, permissions-aware if needed
    """
@@ -2488,11 +2385,7 @@ class TasksViewSet(ReadOnlyModelViewSet):
            queryset = PaperlessTask.objects.filter(task_id=task_id)
        return queryset

-    @action(
-        methods=["post"],
-        detail=False,
-        permission_classes=[IsAuthenticated, AcknowledgeTasksPermissions],
-    )
+    @action(methods=["post"], detail=False)
    def acknowledge(self, request):
        serializer = AcknowledgeTasksViewSerializer(data=request.data)
        serializer.is_valid(raise_exception=True)
--- a/src/locale/en_US/LC_MESSAGES/django.po
+++ b/src/locale/en_US/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: paperless-ngx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-30 16:50+0000\n"
+"POT-Creation-Date: 2025-09-22 18:20+0000\n"
 "PO-Revision-Date: 2022-02-17 04:17\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
@@ -1191,44 +1191,44 @@ msgstr ""
 msgid "workflow runs"
 msgstr ""

-#: documents/serialisers.py:141
+#: documents/serialisers.py:140
 #, python-format
 msgid "Invalid regular expression: %(error)s"
 msgstr ""

-#: documents/serialisers.py:607
+#: documents/serialisers.py:594
 msgid "Invalid color."
 msgstr ""

-#: documents/serialisers.py:636
+#: documents/serialisers.py:623
 msgid "Invalid parent tag."
 msgstr ""

-#: documents/serialisers.py:1793
+#: documents/serialisers.py:1780
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr ""

-#: documents/serialisers.py:1837
+#: documents/serialisers.py:1824
 #, python-format
 msgid "Custom field id must be an integer: %(id)s"
 msgstr ""

-#: documents/serialisers.py:1844
+#: documents/serialisers.py:1831
 #, python-format
 msgid "Custom field with id %(id)s does not exist"
 msgstr ""

-#: documents/serialisers.py:1861 documents/serialisers.py:1871
+#: documents/serialisers.py:1848 documents/serialisers.py:1858
 msgid ""
 "Custom fields must be a list of integers or an object mapping ids to values."
 msgstr ""

-#: documents/serialisers.py:1866
+#: documents/serialisers.py:1853
 msgid "Some custom fields don't exist or were specified twice."
 msgstr ""

-#: documents/serialisers.py:1936
+#: documents/serialisers.py:1923
 msgid "Invalid variable detected."
 msgstr ""

--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -1003,18 +1003,6 @@ THREADS_PER_WORKER = os.getenv(
 # Paperless Specific Settings                                                 #
 ###############################################################################

-IGNORABLE_FILES: Final[list[str]] = [
-    ".DS_Store",
-    ".DS_STORE",
-    "._*",
-    ".stfolder/*",
-    ".stversions/*",
-    ".localized/*",
-    "desktop.ini",
-    "@eaDir/*",
-    "Thumbs.db",
-]
-
 CONSUMER_POLLING = int(os.getenv("PAPERLESS_CONSUMER_POLLING", 0))

 CONSUMER_POLLING_DELAY = int(os.getenv("PAPERLESS_CONSUMER_POLLING_DELAY", 5))
@@ -1037,7 +1025,7 @@ CONSUMER_IGNORE_PATTERNS = list(
    json.loads(
        os.getenv(
            "PAPERLESS_CONSUMER_IGNORE_PATTERNS",
-            json.dumps(IGNORABLE_FILES),
+            '[".DS_Store", ".DS_STORE", "._*", ".stfolder/*", ".stversions/*", ".localized/*", "desktop.ini", "@eaDir/*", "Thumbs.db"]',
        ),
    ),
 )
--- a/uv.lock
+++ b/uv.lock