docker-compose(deps): Bump gotenberg/gotenberg in /docker/compose

Bumps gotenberg/gotenberg from 8.23 to 8.24.

---
updated-dependencies:
- dependency-name: gotenberg/gotenberg
  dependency-version: '8.24'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Dockerfile

@@ -32,7 +32,7 @@ RUN set -eux \
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM ghcr.io/astral-sh/uv:0.9.2-python3.12-bookworm-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.8.22-python3.12-bookworm-slim AS s6-overlay-base
 
 WORKDIR /usr/src/s6
 

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

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

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

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

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

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

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

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

docs/usage.md

@@ -462,24 +462,15 @@ flowchart TD
 Workflows allow you to filter by:
 
 -   Source, e.g. documents uploaded via consume folder, API (& the web UI) and mail fetch
--   File name, including wildcards e.g. \*.pdf will apply to all pdfs.
+-   File name, including wildcards e.g. \*.pdf will apply to all pdfs
 -   File path, including wildcards. Note that enabling `PAPERLESS_CONSUMER_RECURSIVE` would allow, for
     example, automatically assigning documents to different owners based on the upload directory.
 -   Mail rule. Choosing this option will force 'mail fetch' to be the workflow source.
 -   Content matching (`Added`, `Updated` and `Scheduled` triggers only). Filter document content using the matching settings.
-
-There are also 'advanced' filters available for `Added`, `Updated` and `Scheduled` triggers:
-
--   Any Tags: Filter for documents with any of the specified tags.
--   All Tags: Filter for documents with all of the specified tags.
--   No Tags: Filter for documents with none of the specified tags.
--   Document type: Filter documents with this document type.
--   Not Document types: Filter documents without any of these document types.
--   Correspondent: Filter documents with this correspondent.
--   Not Correspondents: Filter documents without any of these correspondents.
--   Storage path: Filter documents with this storage path.
--   Not Storage paths: Filter documents without any of these storage paths.
--   Custom field query: Filter documents with a custom field query (the same as used for the document list filters).
+-   Tags (`Added`, `Updated` and `Scheduled` triggers only). Filter for documents with any of the specified tags
+-   Document type (`Added`, `Updated` and `Scheduled` triggers only). Filter documents with this doc type
+-   Correspondent (`Added`, `Updated` and `Scheduled` triggers only). Filter documents with this correspondent
+-   Storage path (`Added`, `Updated` and `Scheduled` triggers only). Filter documents with this storage path
 
 ### Workflow Actions
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1481,7 +1481,7 @@ export class DocumentDetailComponent
     const modal = this.modalService.open(EmailDocumentDialogComponent, {
       backdrop: 'static',
     })
-    modal.componentInstance.documentIds = [this.document.id]
+    modal.componentInstance.documentId = this.document.id
     modal.componentInstance.hasArchiveVersion =
       !!this.document?.archived_file_name
   }

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

@@ -96,9 +96,6 @@
           <button ngbDropdownItem (click)="mergeSelected()" [disabled]="!userCanAdd || list.selected.size < 2">
             <i-bs name="journals"></i-bs>&nbsp;<ng-container i18n>Merge</ng-container>
           </button>
-          <button ngbDropdownItem (click)="emailSelected()" [disabled]="!userCanEdit">
-            <i-bs name="envelope"></i-bs>&nbsp;<ng-container i18n>Email</ng-container>
-          </button>
         </div>
       </div>
     </div>

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

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

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

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

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

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

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

@@ -256,15 +256,14 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     return this._searchQuery
   }
 
-  emailDocuments(
-    documentIds: number[],
+  emailDocument(
+    documentId: number,
     addresses: string,
     subject: string,
     message: string,
     useArchiveVersion: boolean
   ): Observable<any> {
-    return this.http.post(this.getResourceUrl(null, 'email'), {
-      documents: documentIds,
+    return this.http.post(this.getResourceUrl(documentId, 'email'), {
       addresses: addresses,
       subject: subject,
       message: message,

src/documents/mail.py

@@ -10,20 +10,11 @@ def send_email(
     subject: str,
     body: str,
     to: list[str],
-    attachments: list[tuple[Path, str]],
+    attachment: Path | None = None,
+    attachment_mime_type: str | None = None,
 ) -> int:
     """
-    Send an email with attachments.
-
-    Args:
-        subject: Email subject
-        body: Email body text
-        to: List of recipient email addresses
-        attachments: List of (path, mime_type) tuples for attachments (the list may be empty)
-
-    Returns:
-        Number of emails sent
-
+    Send an email with an optional attachment.
     TODO: re-evaluate this pending https://code.djangoproject.com/ticket/35581 / https://github.com/django/django/pull/18966
     """
     email = EmailMessage(
@@ -31,20 +22,17 @@ def send_email(
         body=body,
         to=to,
     )
+    if attachment:
+        # Something could be renaming the file concurrently so it can't be attached
+        with FileLock(settings.MEDIA_LOCK), attachment.open("rb") as f:
+            content = f.read()
+            if attachment_mime_type == "message/rfc822":
+                # See https://forum.djangoproject.com/t/using-emailmessage-with-an-attached-email-file-crashes-due-to-non-ascii/37981
+                content = message_from_bytes(f.read())
 
-    # Something could be renaming the file concurrently so it can't be attached
-    with FileLock(settings.MEDIA_LOCK):
-        for attachment_path, mime_type in attachments:
-            with attachment_path.open("rb") as f:
-                content = f.read()
-                if mime_type == "message/rfc822":
-                    # See https://forum.djangoproject.com/t/using-emailmessage-with-an-attached-email-file-crashes-due-to-non-ascii/37981
-                    content = message_from_bytes(content)
-
-                email.attach(
-                    filename=attachment_path.name,
-                    content=content,
-                    mimetype=mime_type,
-                )
-
+            email.attach(
+                filename=attachment.name,
+                content=content,
+                mimetype=attachment_mime_type,
+            )
     return email.send()

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
@@ -345,147 +342,67 @@ def consumable_document_matches_workflow(
 def existing_document_matches_workflow(
     document: Document,
     trigger: WorkflowTrigger,
-) -> tuple[bool, str | None]:
+) -> tuple[bool, str]:
     """
     Returns True if the Document matches all filters from the workflow trigger,
     False otherwise. Includes a reason if doesn't match
     """
 
-    # Check content matching algorithm
+    trigger_matched = True
+    reason = ""
+
     if trigger.matching_algorithm > MatchingModel.MATCH_NONE and not matches(
         trigger,
         document,
     ):
-        return (
-            False,
+        reason = (
             f"Document content matching settings for algorithm '{trigger.matching_algorithm}' did not match",
         )
+        trigger_matched = False
 
-    # Check if any tag filters exist to determine if we need to load document tags
-    trigger_has_tags_qs = trigger.filter_has_tags.all()
-    trigger_has_all_tags_qs = trigger.filter_has_all_tags.all()
-    trigger_has_not_tags_qs = trigger.filter_has_not_tags.all()
-
-    has_tags_filter = trigger_has_tags_qs.exists()
-    has_all_tags_filter = trigger_has_all_tags_qs.exists()
-    has_not_tags_filter = trigger_has_not_tags_qs.exists()
-
-    # Load document tags once if any tag filters exist
-    document_tag_ids = None
-    if has_tags_filter or has_all_tags_filter or has_not_tags_filter:
-        document_tag_ids = set(document.tags.values_list("id", flat=True))
-
-    # Document tags vs trigger has_tags (any of)
-    if has_tags_filter:
-        trigger_has_tag_ids = set(trigger_has_tags_qs.values_list("id", flat=True))
-        if not (document_tag_ids & trigger_has_tag_ids):
-            # For error message, load the actual tag objects
-            return (
-                False,
-                f"Document tags {list(document.tags.all())} do not include {list(trigger_has_tags_qs)}",
-            )
-
-    # Document tags vs trigger has_all_tags (all of)
-    if has_all_tags_filter:
-        required_tag_ids = set(trigger_has_all_tags_qs.values_list("id", flat=True))
-        if not required_tag_ids.issubset(document_tag_ids):
-            return (
-                False,
-                f"Document tags {list(document.tags.all())} do not contain all of {list(trigger_has_all_tags_qs)}",
-            )
-
-    # Document tags vs trigger has_not_tags (none of)
-    if has_not_tags_filter:
-        excluded_tag_ids = set(trigger_has_not_tags_qs.values_list("id", flat=True))
-        if document_tag_ids & excluded_tag_ids:
-            return (
-                False,
-                f"Document tags {list(document.tags.all())} include excluded tags {list(trigger_has_not_tags_qs)}",
-            )
+    # 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
+    ):
+        reason = (
+            f"Document tags {document.tags.all()} do not include"
+            f" {trigger.filter_has_tags.all()}",
+        )
+        trigger_matched = False
 
     # Document correspondent vs trigger has_correspondent
     if (
-        trigger.filter_has_correspondent_id is not None
-        and document.correspondent_id != trigger.filter_has_correspondent_id
+        trigger.filter_has_correspondent is not None
+        and document.correspondent != trigger.filter_has_correspondent
     ):
-        return (
-            False,
+        reason = (
             f"Document correspondent {document.correspondent} does not match {trigger.filter_has_correspondent}",
         )
-
-    if (
-        document.correspondent_id
-        and trigger.filter_has_not_correspondents.filter(
-            id=document.correspondent_id,
-        ).exists()
-    ):
-        return (
-            False,
-            f"Document correspondent {document.correspondent} is excluded by {list(trigger.filter_has_not_correspondents.all())}",
-        )
+        trigger_matched = False
 
     # Document document_type vs trigger has_document_type
     if (
-        trigger.filter_has_document_type_id is not None
-        and document.document_type_id != trigger.filter_has_document_type_id
+        trigger.filter_has_document_type is not None
+        and document.document_type != trigger.filter_has_document_type
     ):
-        return (
-            False,
+        reason = (
             f"Document doc type {document.document_type} does not match {trigger.filter_has_document_type}",
         )
-
-    if (
-        document.document_type_id
-        and trigger.filter_has_not_document_types.filter(
-            id=document.document_type_id,
-        ).exists()
-    ):
-        return (
-            False,
-            f"Document doc type {document.document_type} is excluded by {list(trigger.filter_has_not_document_types.all())}",
-        )
+        trigger_matched = False
 
     # Document storage_path vs trigger has_storage_path
     if (
-        trigger.filter_has_storage_path_id is not None
-        and document.storage_path_id != trigger.filter_has_storage_path_id
+        trigger.filter_has_storage_path is not None
+        and document.storage_path != trigger.filter_has_storage_path
     ):
-        return (
-            False,
+        reason = (
             f"Document storage path {document.storage_path} does not match {trigger.filter_has_storage_path}",
         )
-
-    if (
-        document.storage_path_id
-        and trigger.filter_has_not_storage_paths.filter(
-            id=document.storage_path_id,
-        ).exists()
-    ):
-        return (
-            False,
-            f"Document storage path {document.storage_path} is excluded by {list(trigger.filter_has_not_storage_paths.all())}",
-        )
-
-    # Custom field query check
-    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 (False, "Invalid custom field query configuration")
-
-        qs = (
-            Document.objects.filter(id=document.id)
-            .annotate(**annotations)
-            .filter(custom_field_q)
-        )
-        if not qs.exists():
-            return (
-                False,
-                "Document custom fields do not match the configured custom field query",
-            )
+        trigger_matched = False
 
     # Document original_filename vs trigger filename
     if (
@@ -497,12 +414,13 @@ def existing_document_matches_workflow(
             trigger.filter_filename.lower(),
         )
     ):
-        return (
-            False,
-            f"Document filename {document.original_filename} does not match {trigger.filter_filename.lower()}",
+        reason = (
+            f"Document filename {document.original_filename} does not match"
+            f" {trigger.filter_filename.lower()}",
         )
+        trigger_matched = False
 
-    return (True, None)
+    return (trigger_matched, reason)
 
 
 def prefilter_documents_by_workflowtrigger(
@@ -515,66 +433,31 @@ def prefilter_documents_by_workflowtrigger(
     document_matches_workflow in run_workflows
     """
 
-    # Filter for documents that have AT LEAST ONE of the specified tags.
-    if trigger.filter_has_tags.exists():
-        documents = documents.filter(tags__in=trigger.filter_has_tags.all()).distinct()
-
-    # Filter for documents that have ALL of the specified tags.
-    if trigger.filter_has_all_tags.exists():
-        for tag in trigger.filter_has_all_tags.all():
-            documents = documents.filter(tags=tag)
-        # Multiple JOINs can create duplicate results.
-        documents = documents.distinct()
-
-    # Exclude documents that have ANY of the specified tags.
-    if trigger.filter_has_not_tags.exists():
-        documents = documents.exclude(tags__in=trigger.filter_has_not_tags.all())
-
-    # Correspondent, DocumentType, etc. filtering
+    if trigger.filter_has_tags.all().count() > 0:
+        documents = documents.filter(
+            tags__in=trigger.filter_has_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.exists():
-        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.exists():
-        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.exists():
-        documents = documents.exclude(
-            storage_path__in=trigger.filter_has_not_storage_paths.all(),
-        )
 
-    # Custom Field & Filename Filtering
-
-    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:
+    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("$")
-        documents = documents.filter(original_filename__iregex=regex)
+        regex = f"(?i){regex}"
+        documents = documents.filter(original_filename__regex=regex)
 
     return documents
 
@@ -589,34 +472,13 @@ def document_matches_workflow(
     settings from the workflow trigger, False otherwise
     """
 
-    triggers_queryset = (
-        workflow.triggers.filter(
-            type=trigger_type,
-        )
-        .select_related(
-            "filter_mailrule",
-            "filter_has_document_type",
-            "filter_has_correspondent",
-            "filter_has_storage_path",
-            "schedule_date_custom_field",
-        )
-        .prefetch_related(
-            "filter_has_tags",
-            "filter_has_all_tags",
-            "filter_has_not_tags",
-            "filter_has_not_document_types",
-            "filter_has_not_correspondents",
-            "filter_has_not_storage_paths",
-        )
-    )
-
     trigger_matched = True
-    if not triggers_queryset.exists():
+    if workflow.triggers.filter(type=trigger_type).count() == 0:
         trigger_matched = False
         logger.info(f"Document did not match {workflow}")
         logger.debug(f"No matching triggers with type {trigger_type} found")
     else:
-        for trigger in triggers_queryset:
+        for trigger in workflow.triggers.filter(type=trigger_type):
             if trigger_type == WorkflowTrigger.WorkflowTriggerType.CONSUMPTION:
                 trigger_matched, reason = consumable_document_matches_workflow(
                     document,

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)",
-            ),
-        ),
-    ]

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,

src/documents/serialisers.py

@@ -16,7 +16,6 @@ from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.core.validators import DecimalValidator
-from django.core.validators import EmailValidator
 from django.core.validators import MaxLengthValidator
 from django.core.validators import RegexValidator
 from django.core.validators import integer_validator
@@ -44,7 +43,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
@@ -1908,51 +1906,6 @@ class BulkDownloadSerializer(DocumentListSerializer):
         }[compression]
 
 
-class EmailSerializer(DocumentListSerializer):
-    addresses = serializers.CharField(
-        required=True,
-        label="Email addresses",
-        help_text="Comma-separated email addresses",
-    )
-
-    subject = serializers.CharField(
-        required=True,
-        label="Email subject",
-    )
-
-    message = serializers.CharField(
-        required=True,
-        label="Email message",
-    )
-
-    use_archive_version = serializers.BooleanField(
-        default=True,
-        label="Use archive version",
-        help_text="Use archive version of documents if available",
-    )
-
-    def validate_addresses(self, addresses):
-        address_list = [addr.strip() for addr in addresses.split(",")]
-        if not address_list:
-            raise serializers.ValidationError("At least one email address is required")
-
-        email_validator = EmailValidator()
-        try:
-            for address in address_list:
-                email_validator(address)
-        except ValidationError:
-            raise serializers.ValidationError(f"Invalid email address: {address}")
-
-        return ",".join(address_list)
-
-    def validate_documents(self, documents):
-        super().validate_documents(documents)
-        if not documents:
-            raise serializers.ValidationError("At least one document is required")
-
-        return documents
-
-
 class StoragePathSerializer(MatchingModelSerializer, OwnedObjectSerializer):
     class Meta:
         model = StoragePath
@@ -2241,12 +2194,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",
@@ -2272,20 +2219,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
@@ -2481,20 +2414,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(
@@ -2503,22 +2422,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:

src/documents/signals/handlers.py

@@ -1162,14 +1162,12 @@ def run_workflows(
             else ""
         )
         try:
-            attachments = []
-            if action.email.include_document and original_file:
-                attachments = [(original_file, document.mime_type)]
             n_messages = send_email(
                 subject=subject,
                 body=body,
                 to=action.email.to.split(","),
-                attachments=attachments,
+                attachment=original_file if action.email.include_document else None,
+                attachment_mime_type=document.mime_type,
             )
             logger.debug(
                 f"Sent {n_messages} notification email(s) to {action.email.to}",

src/documents/tests/test_api_documents.py

@@ -3093,7 +3093,7 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
                 "message": "hello",
             },
         )
-        self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(resp.status_code, status.HTTP_404_NOT_FOUND)
 
         resp = self.client.post(
             f"/api/documents/{doc.pk}/email/",

src/documents/tests/test_api_email.py

@@ -1,330 +0,0 @@
-import json
-import shutil
-from unittest import mock
-
-from django.contrib.auth.models import Permission
-from django.contrib.auth.models import User
-from django.core import mail
-from django.test import override_settings
-from rest_framework import status
-from rest_framework.test import APITestCase
-
-from documents.models import Document
-from documents.tests.utils import DirectoriesMixin
-from documents.tests.utils import SampleDirMixin
-
-
-class TestEmail(DirectoriesMixin, SampleDirMixin, APITestCase):
-    ENDPOINT = "/api/documents/email/"
-
-    def setUp(self):
-        super().setUp()
-
-        self.user = User.objects.create_superuser(username="temp_admin")
-        self.client.force_authenticate(user=self.user)
-
-        self.doc1 = Document.objects.create(
-            title="test1",
-            mime_type="application/pdf",
-            content="this is document 1",
-            checksum="1",
-            filename="test1.pdf",
-            archive_checksum="A1",
-            archive_filename="archive1.pdf",
-        )
-        self.doc2 = Document.objects.create(
-            title="test2",
-            mime_type="application/pdf",
-            content="this is document 2",
-            checksum="2",
-            filename="test2.pdf",
-        )
-
-        # Copy sample files to document paths
-        shutil.copy(self.SAMPLE_DIR / "simple.pdf", self.doc1.archive_path)
-        shutil.copy(self.SAMPLE_DIR / "simple.pdf", self.doc1.source_path)
-        shutil.copy(self.SAMPLE_DIR / "simple.pdf", self.doc2.source_path)
-
-    @override_settings(
-        EMAIL_ENABLED=True,
-        EMAIL_BACKEND="django.core.mail.backends.locmem.EmailBackend",
-    )
-    def test_email_success(self):
-        """
-        GIVEN:
-            - Multiple existing documents
-        WHEN:
-            - API request is made to bulk email documents
-        THEN:
-            - Email is sent with all documents attached
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk, self.doc2.pk],
-                    "addresses": "hello@paperless-ngx.com,test@example.com",
-                    "subject": "Bulk email test",
-                    "message": "Here are your documents",
-                },
-            ),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data["message"], "Email sent")
-        self.assertEqual(len(mail.outbox), 1)
-
-        email = mail.outbox[0]
-        self.assertEqual(email.to, ["hello@paperless-ngx.com", "test@example.com"])
-        self.assertEqual(email.subject, "Bulk email test")
-        self.assertEqual(email.body, "Here are your documents")
-        self.assertEqual(len(email.attachments), 2)
-
-        # Check attachment names (should default to archive version for doc1, original for doc2)
-        attachment_names = [att[0] for att in email.attachments]
-        self.assertIn("archive1.pdf", attachment_names)
-        self.assertIn("test2.pdf", attachment_names)
-
-    @override_settings(
-        EMAIL_ENABLED=True,
-        EMAIL_BACKEND="django.core.mail.backends.locmem.EmailBackend",
-    )
-    def test_email_use_original_version(self):
-        """
-        GIVEN:
-            - Documents with archive versions
-        WHEN:
-            - API request is made to bulk email with use_archive_version=False
-        THEN:
-            - Original files are attached instead of archive versions
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk],
-                    "addresses": "test@example.com",
-                    "subject": "Test",
-                    "message": "Test message",
-                    "use_archive_version": False,
-                },
-            ),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(len(mail.outbox), 1)
-        self.assertEqual(mail.outbox[0].attachments[0][0], "test1.pdf")
-
-    def test_email_missing_required_fields(self):
-        """
-        GIVEN:
-            - Request with missing required fields
-        WHEN:
-            - API request is made to bulk email endpoint
-        THEN:
-            - Bad request response is returned
-        """
-        # Missing addresses
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk],
-                    "subject": "Test",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-        # Missing subject
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk],
-                    "addresses": "test@example.com",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-        # Missing message
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk],
-                    "addresses": "test@example.com",
-                    "subject": "Test",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-        # Missing documents
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "addresses": "test@example.com",
-                    "subject": "Test",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-    def test_email_empty_document_list(self):
-        """
-        GIVEN:
-            - Request with empty document list
-        WHEN:
-            - API request is made to bulk email endpoint
-        THEN:
-            - Bad request response is returned
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [],
-                    "addresses": "test@example.com",
-                    "subject": "Test",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-    def test_email_invalid_document_id(self):
-        """
-        GIVEN:
-            - Request with non-existent document ID
-        WHEN:
-            - API request is made to bulk email endpoint
-        THEN:
-            - Bad request response is returned
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [999],
-                    "addresses": "test@example.com",
-                    "subject": "Test",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-    def test_email_invalid_email_address(self):
-        """
-        GIVEN:
-            - Request with invalid email address
-        WHEN:
-            - API request is made to bulk email endpoint
-        THEN:
-            - Bad request response is returned
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk],
-                    "addresses": "invalid-email",
-                    "subject": "Test",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-        # Test multiple addresses with one invalid
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk],
-                    "addresses": "valid@example.com,invalid-email",
-                    "subject": "Test",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-    def test_email_insufficient_permissions(self):
-        """
-        GIVEN:
-            - User without permissions to view document
-        WHEN:
-            - API request is made to bulk email documents
-        THEN:
-            - Forbidden response is returned
-        """
-        user1 = User.objects.create_user(username="test1")
-        user1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
-
-        doc_owned = Document.objects.create(
-            title="owned_doc",
-            mime_type="application/pdf",
-            checksum="owned",
-            owner=self.user,
-        )
-
-        self.client.force_authenticate(user1)
-
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk, doc_owned.pk],
-                    "addresses": "test@example.com",
-                    "subject": "Test",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-
-    @mock.patch(
-        "django.core.mail.message.EmailMessage.send",
-        side_effect=Exception("Email error"),
-    )
-    def test_email_send_error(self, mocked_send):
-        """
-        GIVEN:
-            - Existing documents
-        WHEN:
-            - API request is made to bulk email and error occurs during email send
-        THEN:
-            - Server error response is returned
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "documents": [self.doc1.pk],
-                    "addresses": "test@example.com",
-                    "subject": "Test",
-                    "message": "Test message",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-        self.assertIn("Error emailing documents", response.content.decode())

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):

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
@@ -1083,409 +1080,9 @@ class TestWorkflows(
             )
             expected_str = f"Document did not match {w}"
             self.assertIn(expected_str, cm.output[0])
-            expected_str = f"Document tags {list(doc.tags.all())} do not include {list(trigger.filter_has_tags.all())}"
+            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 {list(doc.tags.all())} do not contain all of"
-                f" {list(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 {list(doc.tags.all())} include excluded tags"
-                f" {list(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" {list(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" {list(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" {list(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.assertIsNone(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,

src/documents/views.py

@@ -57,7 +57,6 @@ from django_filters.rest_framework import DjangoFilterBackend
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import OpenApiParameter
 from drf_spectacular.utils import extend_schema
-from drf_spectacular.utils import extend_schema_serializer
 from drf_spectacular.utils import extend_schema_view
 from drf_spectacular.utils import inline_serializer
 from guardian.utils import get_group_obj_perms_model
@@ -154,7 +153,6 @@ from documents.serialisers import CustomFieldSerializer
 from documents.serialisers import DocumentListSerializer
 from documents.serialisers import DocumentSerializer
 from documents.serialisers import DocumentTypeSerializer
-from documents.serialisers import EmailSerializer
 from documents.serialisers import NotesSerializer
 from documents.serialisers import PostDocumentSerializer
 from documents.serialisers import RunTaskViewSerializer
@@ -473,14 +471,6 @@ class DocumentTypeViewSet(ModelViewSet, PermissionsAwareDocumentCountMixin):
     ordering_fields = ("name", "matching_algorithm", "match", "document_count")
 
 
-@extend_schema_serializer(
-    component_name="EmailDocumentRequest",
-    exclude_fields=("documents",),
-)
-class EmailDocumentDetailSchema(EmailSerializer):
-    pass
-
-
 @extend_schema_view(
     retrieve=extend_schema(
         description="Retrieve a single document",
@@ -648,28 +638,20 @@ class EmailDocumentDetailSchema(EmailSerializer):
             404: None,
         },
     ),
-    email_document=extend_schema(
+    email=extend_schema(
         description="Email the document to one or more recipients as an attachment.",
-        request=EmailDocumentDetailSchema,
+        request=inline_serializer(
+            name="EmailRequest",
+            fields={
+                "addresses": serializers.CharField(),
+                "subject": serializers.CharField(),
+                "message": serializers.CharField(),
+                "use_archive_version": serializers.BooleanField(default=True),
+            },
+        ),
         responses={
             200: inline_serializer(
-                name="EmailDocumentResponse",
-                fields={"message": serializers.CharField()},
-            ),
-            400: None,
-            403: None,
-            404: None,
-            500: None,
-        },
-        deprecated=True,
-    ),
-    email_documents=extend_schema(
-        operation_id="email_documents",
-        description="Email one or more documents as attachments to one or more recipients.",
-        request=EmailSerializer,
-        responses={
-            200: inline_serializer(
-                name="EmailDocumentsResponse",
+                name="EmailResponse",
                 fields={"message": serializers.CharField()},
             ),
             400: None,
@@ -1173,65 +1155,55 @@ class DocumentViewSet(
 
         return Response(sorted(entries, key=lambda x: x["timestamp"], reverse=True))
 
-    @action(methods=["post"], detail=True, url_path="email")
-    # TODO: deprecated as of 2.19, remove in future release
-    def email_document(self, request, pk=None):
-        request_data = request.data.copy()
-        request_data.setlist("documents", [pk])
-        return self.email_documents(request, data=request_data)
-
-    @action(
-        methods=["post"],
-        detail=False,
-        url_path="email",
-        serializer_class=EmailSerializer,
-    )
-    def email_documents(self, request, data=None):
-        serializer = EmailSerializer(data=data or request.data)
-        serializer.is_valid(raise_exception=True)
-
-        validated_data = serializer.validated_data
-        document_ids = validated_data.get("documents")
-        addresses = validated_data.get("addresses").split(",")
-        addresses = [addr.strip() for addr in addresses]
-        subject = validated_data.get("subject")
-        message = validated_data.get("message")
-        use_archive_version = validated_data.get("use_archive_version", True)
-
-        documents = Document.objects.select_related("owner").filter(pk__in=document_ids)
-        for document in documents:
+    @action(methods=["post"], detail=True)
+    def email(self, request, pk=None):
+        try:
+            doc = Document.objects.select_related("owner").get(pk=pk)
             if request.user is not None and not has_perms_owner_aware(
                 request.user,
                 "view_document",
-                document,
+                doc,
             ):
                 return HttpResponseForbidden("Insufficient permissions")
-
-        attachments = []
-        for doc in documents:
-            attachment_path = (
-                doc.archive_path
-                if use_archive_version and doc.has_archive_version
-                else doc.source_path
-            )
-            attachments.append((attachment_path, doc.mime_type))
+        except Document.DoesNotExist:
+            raise Http404
 
         try:
-            send_email(
-                subject=subject,
-                body=message,
-                to=addresses,
-                attachments=attachments,
-            )
+            if (
+                "addresses" not in request.data
+                or "subject" not in request.data
+                or "message" not in request.data
+            ):
+                return HttpResponseBadRequest("Missing required fields")
 
+            use_archive_version = request.data.get("use_archive_version", True)
+
+            addresses = request.data.get("addresses").split(",")
+            if not all(
+                re.match(r"[^@]+@[^@]+\.[^@]+", address.strip())
+                for address in addresses
+            ):
+                return HttpResponseBadRequest("Invalid email address found")
+
+            send_email(
+                subject=request.data.get("subject"),
+                body=request.data.get("message"),
+                to=addresses,
+                attachment=(
+                    doc.archive_path
+                    if use_archive_version and doc.has_archive_version
+                    else doc.source_path
+                ),
+                attachment_mime_type=doc.mime_type,
+            )
             logger.debug(
-                f"Sent documents {[doc.id for doc in documents]} via email to {addresses}",
+                f"Sent document {doc.id} via email to {addresses}",
             )
             return Response({"message": "Email sent"})
         except Exception as e:
-            logger.warning(f"An error occurred emailing documents: {e!s}")
+            logger.warning(f"An error occurred emailing document: {e!s}")
             return HttpResponseServerError(
-                "Error emailing documents, check logs for more detail.",
+                "Error emailing document, check logs for more detail.",
             )
 
 

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-10-13 22:25+0000\n"
+"POT-Creation-Date: 2025-09-30 16:50+0000\n"
 "PO-Revision-Date: 2022-02-17 04:17\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Automatic"
 msgstr ""
 
-#: documents/models.py:64 documents/models.py:456 documents/models.py:1526
+#: documents/models.py:64 documents/models.py:456 documents/models.py:1484
 #: paperless_mail/models.py:23 paperless_mail/models.py:143
 msgid "name"
 msgstr ""
@@ -264,7 +264,7 @@ msgid "The position of this document in your physical document archive."
 msgstr ""
 
 #: documents/models.py:318 documents/models.py:699 documents/models.py:753
-#: documents/models.py:1569
+#: documents/models.py:1527
 msgid "document"
 msgstr ""
 
@@ -864,399 +864,371 @@ msgstr ""
 msgid "has these tag(s)"
 msgstr ""
 
-#: documents/models.py:1072
-msgid "has all of these tag(s)"
-msgstr ""
-
-#: documents/models.py:1079
-msgid "does not have these tag(s)"
-msgstr ""
-
-#: documents/models.py:1087
+#: documents/models.py:1073
 msgid "has this document type"
 msgstr ""
 
-#: documents/models.py:1094
-msgid "does not have these document type(s)"
-msgstr ""
-
-#: documents/models.py:1102
+#: documents/models.py:1081
 msgid "has this correspondent"
 msgstr ""
 
-#: documents/models.py:1109
-msgid "does not have these correspondent(s)"
-msgstr ""
-
-#: documents/models.py:1117
+#: documents/models.py:1089
 msgid "has this storage path"
 msgstr ""
 
-#: documents/models.py:1124
-msgid "does not have these storage path(s)"
-msgstr ""
-
-#: documents/models.py:1128
-msgid "filter custom field query"
-msgstr ""
-
-#: documents/models.py:1131
-msgid "JSON-encoded custom field query expression."
-msgstr ""
-
-#: documents/models.py:1135
+#: documents/models.py:1093
 msgid "schedule offset days"
 msgstr ""
 
-#: documents/models.py:1138
+#: documents/models.py:1096
 msgid "The number of days to offset the schedule trigger by."
 msgstr ""
 
-#: documents/models.py:1143
+#: documents/models.py:1101
 msgid "schedule is recurring"
 msgstr ""
 
-#: documents/models.py:1146
+#: documents/models.py:1104
 msgid "If the schedule should be recurring."
 msgstr ""
 
-#: documents/models.py:1151
+#: documents/models.py:1109
 msgid "schedule recurring delay in days"
 msgstr ""
 
-#: documents/models.py:1155
+#: documents/models.py:1113
 msgid "The number of days between recurring schedule triggers."
 msgstr ""
 
-#: documents/models.py:1160
+#: documents/models.py:1118
 msgid "schedule date field"
 msgstr ""
 
-#: documents/models.py:1165
+#: documents/models.py:1123
 msgid "The field to check for a schedule trigger."
 msgstr ""
 
-#: documents/models.py:1174
+#: documents/models.py:1132
 msgid "schedule date custom field"
 msgstr ""
 
-#: documents/models.py:1178
+#: documents/models.py:1136
 msgid "workflow trigger"
 msgstr ""
 
-#: documents/models.py:1179
+#: documents/models.py:1137
 msgid "workflow triggers"
 msgstr ""
 
-#: documents/models.py:1187
+#: documents/models.py:1145
 msgid "email subject"
 msgstr ""
 
-#: documents/models.py:1191
+#: documents/models.py:1149
 msgid ""
 "The subject of the email, can include some placeholders, see documentation."
 msgstr ""
 
-#: documents/models.py:1197
+#: documents/models.py:1155
 msgid "email body"
 msgstr ""
 
-#: documents/models.py:1200
+#: documents/models.py:1158
 msgid ""
 "The body (message) of the email, can include some placeholders, see "
 "documentation."
 msgstr ""
 
-#: documents/models.py:1206
+#: documents/models.py:1164
 msgid "emails to"
 msgstr ""
 
-#: documents/models.py:1209
+#: documents/models.py:1167
 msgid "The destination email addresses, comma separated."
 msgstr ""
 
-#: documents/models.py:1215
+#: documents/models.py:1173
 msgid "include document in email"
 msgstr ""
 
-#: documents/models.py:1226
+#: documents/models.py:1184
 msgid "webhook url"
 msgstr ""
 
-#: documents/models.py:1229
+#: documents/models.py:1187
 msgid "The destination URL for the notification."
 msgstr ""
 
-#: documents/models.py:1234
+#: documents/models.py:1192
 msgid "use parameters"
 msgstr ""
 
-#: documents/models.py:1239
+#: documents/models.py:1197
 msgid "send as JSON"
 msgstr ""
 
-#: documents/models.py:1243
+#: documents/models.py:1201
 msgid "webhook parameters"
 msgstr ""
 
-#: documents/models.py:1246
+#: documents/models.py:1204
 msgid "The parameters to send with the webhook URL if body not used."
 msgstr ""
 
-#: documents/models.py:1250
+#: documents/models.py:1208
 msgid "webhook body"
 msgstr ""
 
-#: documents/models.py:1253
+#: documents/models.py:1211
 msgid "The body to send with the webhook URL if parameters not used."
 msgstr ""
 
-#: documents/models.py:1257
+#: documents/models.py:1215
 msgid "webhook headers"
 msgstr ""
 
-#: documents/models.py:1260
+#: documents/models.py:1218
 msgid "The headers to send with the webhook URL."
 msgstr ""
 
-#: documents/models.py:1265
+#: documents/models.py:1223
 msgid "include document in webhook"
 msgstr ""
 
-#: documents/models.py:1276
+#: documents/models.py:1234
 msgid "Assignment"
 msgstr ""
 
-#: documents/models.py:1280
+#: documents/models.py:1238
 msgid "Removal"
 msgstr ""
 
-#: documents/models.py:1284 documents/templates/account/password_reset.html:15
+#: documents/models.py:1242 documents/templates/account/password_reset.html:15
 msgid "Email"
 msgstr ""
 
-#: documents/models.py:1288
+#: documents/models.py:1246
 msgid "Webhook"
 msgstr ""
 
-#: documents/models.py:1292
+#: documents/models.py:1250
 msgid "Workflow Action Type"
 msgstr ""
 
-#: documents/models.py:1298
+#: documents/models.py:1256
 msgid "assign title"
 msgstr ""
 
-#: documents/models.py:1302
+#: documents/models.py:1260
 msgid "Assign a document title, must  be a Jinja2 template, see documentation."
 msgstr ""
 
-#: documents/models.py:1310 paperless_mail/models.py:274
+#: documents/models.py:1268 paperless_mail/models.py:274
 msgid "assign this tag"
 msgstr ""
 
-#: documents/models.py:1319 paperless_mail/models.py:282
+#: documents/models.py:1277 paperless_mail/models.py:282
 msgid "assign this document type"
 msgstr ""
 
-#: documents/models.py:1328 paperless_mail/models.py:296
+#: documents/models.py:1286 paperless_mail/models.py:296
 msgid "assign this correspondent"
 msgstr ""
 
-#: documents/models.py:1337
+#: documents/models.py:1295
 msgid "assign this storage path"
 msgstr ""
 
-#: documents/models.py:1346
+#: documents/models.py:1304
 msgid "assign this owner"
 msgstr ""
 
-#: documents/models.py:1353
+#: documents/models.py:1311
 msgid "grant view permissions to these users"
 msgstr ""
 
-#: documents/models.py:1360
+#: documents/models.py:1318
 msgid "grant view permissions to these groups"
 msgstr ""
 
-#: documents/models.py:1367
+#: documents/models.py:1325
 msgid "grant change permissions to these users"
 msgstr ""
 
-#: documents/models.py:1374
+#: documents/models.py:1332
 msgid "grant change permissions to these groups"
 msgstr ""
 
-#: documents/models.py:1381
+#: documents/models.py:1339
 msgid "assign these custom fields"
 msgstr ""
 
-#: documents/models.py:1385
+#: documents/models.py:1343
 msgid "custom field values"
 msgstr ""
 
-#: documents/models.py:1389
+#: documents/models.py:1347
 msgid "Optional values to assign to the custom fields."
 msgstr ""
 
-#: documents/models.py:1398
+#: documents/models.py:1356
 msgid "remove these tag(s)"
 msgstr ""
 
-#: documents/models.py:1403
+#: documents/models.py:1361
 msgid "remove all tags"
 msgstr ""
 
-#: documents/models.py:1410
+#: documents/models.py:1368
 msgid "remove these document type(s)"
 msgstr ""
 
-#: documents/models.py:1415
+#: documents/models.py:1373
 msgid "remove all document types"
 msgstr ""
 
-#: documents/models.py:1422
+#: documents/models.py:1380
 msgid "remove these correspondent(s)"
 msgstr ""
 
-#: documents/models.py:1427
+#: documents/models.py:1385
 msgid "remove all correspondents"
 msgstr ""
 
-#: documents/models.py:1434
+#: documents/models.py:1392
 msgid "remove these storage path(s)"
 msgstr ""
 
-#: documents/models.py:1439
+#: documents/models.py:1397
 msgid "remove all storage paths"
 msgstr ""
 
-#: documents/models.py:1446
+#: documents/models.py:1404
 msgid "remove these owner(s)"
 msgstr ""
 
-#: documents/models.py:1451
+#: documents/models.py:1409
 msgid "remove all owners"
 msgstr ""
 
-#: documents/models.py:1458
+#: documents/models.py:1416
 msgid "remove view permissions for these users"
 msgstr ""
 
-#: documents/models.py:1465
+#: documents/models.py:1423
 msgid "remove view permissions for these groups"
 msgstr ""
 
-#: documents/models.py:1472
+#: documents/models.py:1430
 msgid "remove change permissions for these users"
 msgstr ""
 
-#: documents/models.py:1479
+#: documents/models.py:1437
 msgid "remove change permissions for these groups"
 msgstr ""
 
-#: documents/models.py:1484
+#: documents/models.py:1442
 msgid "remove all permissions"
 msgstr ""
 
-#: documents/models.py:1491
+#: documents/models.py:1449
 msgid "remove these custom fields"
 msgstr ""
 
-#: documents/models.py:1496
+#: documents/models.py:1454
 msgid "remove all custom fields"
 msgstr ""
 
-#: documents/models.py:1505
+#: documents/models.py:1463
 msgid "email"
 msgstr ""
 
-#: documents/models.py:1514
+#: documents/models.py:1472
 msgid "webhook"
 msgstr ""
 
-#: documents/models.py:1518
+#: documents/models.py:1476
 msgid "workflow action"
 msgstr ""
 
-#: documents/models.py:1519
+#: documents/models.py:1477
 msgid "workflow actions"
 msgstr ""
 
-#: documents/models.py:1528 paperless_mail/models.py:145
+#: documents/models.py:1486 paperless_mail/models.py:145
 msgid "order"
 msgstr ""
 
-#: documents/models.py:1534
+#: documents/models.py:1492
 msgid "triggers"
 msgstr ""
 
-#: documents/models.py:1541
+#: documents/models.py:1499
 msgid "actions"
 msgstr ""
 
-#: documents/models.py:1544 paperless_mail/models.py:154
+#: documents/models.py:1502 paperless_mail/models.py:154
 msgid "enabled"
 msgstr ""
 
-#: documents/models.py:1555
+#: documents/models.py:1513
 msgid "workflow"
 msgstr ""
 
-#: documents/models.py:1559
+#: documents/models.py:1517
 msgid "workflow trigger type"
 msgstr ""
 
-#: documents/models.py:1573
+#: documents/models.py:1531
 msgid "date run"
 msgstr ""
 
-#: documents/models.py:1579
+#: documents/models.py:1537
 msgid "workflow run"
 msgstr ""
 
-#: documents/models.py:1580
+#: documents/models.py:1538
 msgid "workflow runs"
 msgstr ""
 
-#: documents/serialisers.py:143
+#: documents/serialisers.py:141
 #, python-format
 msgid "Invalid regular expression: %(error)s"
 msgstr ""
 
-#: documents/serialisers.py:609
+#: documents/serialisers.py:607
 msgid "Invalid color."
 msgstr ""
 
-#: documents/serialisers.py:638
+#: documents/serialisers.py:636
 msgid "Invalid parent tag."
 msgstr ""
 
-#: documents/serialisers.py:1795
+#: documents/serialisers.py:1793
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr ""
 
-#: documents/serialisers.py:1839
+#: documents/serialisers.py:1837
 #, python-format
 msgid "Custom field id must be an integer: %(id)s"
 msgstr ""
 
-#: documents/serialisers.py:1846
+#: documents/serialisers.py:1844
 #, python-format
 msgid "Custom field with id %(id)s does not exist"
 msgstr ""
 
-#: documents/serialisers.py:1863 documents/serialisers.py:1873
+#: documents/serialisers.py:1861 documents/serialisers.py:1871
 msgid ""
 "Custom fields must be a list of integers or an object mapping ids to values."
 msgstr ""
 
-#: documents/serialisers.py:1868
+#: documents/serialisers.py:1866
 msgid "Some custom fields don't exist or were specified twice."
 msgstr ""
 
-#: documents/serialisers.py:1983
+#: documents/serialisers.py:1936
 msgid "Invalid variable detected."
 msgstr ""