diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index c64cef921..5101128b3 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -560,7 +560,7 @@ src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 72 + 75 src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html @@ -726,7 +726,7 @@ src/app/components/manage/mail/mail.component.html - 137 + 139 src/app/components/manage/management-list/management-list.component.html @@ -1100,11 +1100,11 @@ src/app/components/manage/mail/mail.component.html - 99 + 101 src/app/components/manage/mail/mail.component.html - 111 + 113 src/app/components/manage/management-list/management-list.component.html @@ -1406,7 +1406,7 @@ src/app/components/manage/mail/mail.component.html - 81 + 82 src/app/components/manage/management-list/management-list.component.html @@ -1505,11 +1505,11 @@ src/app/components/manage/mail/mail.component.html - 100 + 102 src/app/components/manage/mail/mail.component.html - 114 + 116 src/app/components/manage/management-list/management-list.component.html @@ -1668,7 +1668,7 @@ src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 71 + 74 src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html @@ -2430,11 +2430,11 @@ src/app/components/manage/mail/mail.component.html - 98 + 100 src/app/components/manage/mail/mail.component.html - 108 + 110 src/app/components/manage/management-list/management-list.component.html @@ -3666,166 +3666,185 @@ 88 - - Rule order - - src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 16 - - Account src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 19 + 16 src/app/components/manage/mail/mail.component.html 80 + + Order + + src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html + 19 + + + + Enabled + + src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html + 22 + + + src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html + 19 + + + src/app/components/manage/mail/mail.component.html + 92 + + + src/app/components/manage/workflows/workflows.component.html + 30 + + Paperless will only process mails that match all of the criteria specified below. src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 24 + 27 Folder src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 26 + 29 Subfolders must be separated by a delimiter, often a dot ('.') or slash ('/'), but it varies by mail server. src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 26 + 29 Maximum age (days) src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 27 + 30 Filter from src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 30 + 33 Filter to src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 31 + 34 Filter subject src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 32 + 35 Filter body src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 33 + 36 Consumption scope src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 39 + 42 See docs for .eml processing requirements src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 39 + 42 Attachment type src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 40 + 43 Include only files matching src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 43 + 46 Optional. Wildcards e.g. *.pdf or *invoice* allowed. Can be comma-separated list. Case insensitive. src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 43 + 46 src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 44 + 47 Exclude files matching src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 44 + 47 Action src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 50 + 53 Only performed if the mail is processed. src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 50 + 53 Action parameter src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 52 + 55 Assign title from src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 54 + 57 Assign owner from rule src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 55 + 58 Assign document type src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 59 + 62 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -3836,14 +3855,14 @@ Assign correspondent from src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 60 + 63 Assign correspondent src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 62 + 65 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -3854,7 +3873,7 @@ Error src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 69 + 72 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -4166,17 +4185,6 @@ 18 - - Enabled - - src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 19 - - - src/app/components/manage/workflows/workflows.component.html - 30 - - Triggers @@ -5043,11 +5051,11 @@ src/app/components/manage/mail/mail.component.html - 101 + 103 src/app/components/manage/mail/mail.component.html - 119 + 121 src/app/components/manage/workflows/workflows.component.html @@ -5358,6 +5366,10 @@ src/app/components/common/toasts/toasts.component.html 26 + + src/app/components/manage/mail/mail.component.html + 81 + src/app/components/manage/workflows/workflows.component.html 19 @@ -7513,11 +7525,22 @@ 79 + + Disabled + + src/app/components/manage/mail/mail.component.html + 92 + + + src/app/components/manage/workflows/workflows.component.html + 30 + + No mail rules defined. src/app/components/manage/mail/mail.component.html - 128 + 130 @@ -7879,13 +7902,6 @@ 9 - - Disabled - - src/app/components/manage/workflows/workflows.component.html - 30 - - No workflows defined. @@ -8779,21 +8795,21 @@ Successfully completed one-time migratration of settings to the database! src/app/services/settings.service.ts - 573 + 574 Unable to migrate settings to the database, please try saving manually. src/app/services/settings.service.ts - 574 + 575 You can restart the tour from the settings page. src/app/services/settings.service.ts - 644 + 645 diff --git a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html index a7c0617b0..a9ad3040b 100644 --- a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html @@ -12,12 +12,15 @@
-
- -
-
+
+
+ +
+
+ +
diff --git a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.spec.ts b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.spec.ts index 53546a55d..19655ae4d 100644 --- a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.spec.ts @@ -24,6 +24,7 @@ import { TextComponent } from '../../input/text/text.component' import { EditDialogMode } from '../edit-dialog.component' import { MailRuleEditDialogComponent } from './mail-rule-edit-dialog.component' import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' +import { SwitchComponent } from '../../input/switch/switch.component' describe('MailRuleEditDialogComponent', () => { let component: MailRuleEditDialogComponent @@ -43,6 +44,7 @@ describe('MailRuleEditDialogComponent', () => { TagsComponent, SafeHtmlPipe, CheckComponent, + SwitchComponent, ], imports: [FormsModule, ReactiveFormsModule, NgSelectModule, NgbModule], providers: [ diff --git a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts index 51793e78a..633c49967 100644 --- a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts @@ -153,6 +153,7 @@ export class MailRuleEditDialogComponent extends EditDialogComponent { return new FormGroup({ name: new FormControl(null), account: new FormControl(null), + enabled: new FormControl(true), folder: new FormControl('INBOX'), filter_from: new FormControl(null), filter_to: new FormControl(null), diff --git a/src-ui/src/app/components/manage/mail/mail.component.html b/src-ui/src/app/components/manage/mail/mail.component.html index add5614c4..da2be1d6b 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.html +++ b/src-ui/src/app/components/manage/mail/mail.component.html @@ -78,6 +78,7 @@
Name
Sort Order
Account
+
Status
Actions
@@ -88,6 +89,7 @@
{{rule.order}}
{{(mailAccountService.getCached(rule.account) | async)?.name}}
+
@if(rule.enabled) { Enabled } @else { Disabled }
diff --git a/src-ui/src/app/data/mail-rule.ts b/src-ui/src/app/data/mail-rule.ts index 2611fa3ba..7888b19e6 100644 --- a/src-ui/src/app/data/mail-rule.ts +++ b/src-ui/src/app/data/mail-rule.ts @@ -39,6 +39,8 @@ export interface MailRule extends ObjectWithPermissions { order: number + enabled: boolean + folder: string filter_from: string diff --git a/src-ui/src/app/services/rest/mail-rule.service.spec.ts b/src-ui/src/app/services/rest/mail-rule.service.spec.ts index ea84e8b86..87e21172c 100644 --- a/src-ui/src/app/services/rest/mail-rule.service.spec.ts +++ b/src-ui/src/app/services/rest/mail-rule.service.spec.ts @@ -18,6 +18,7 @@ const mail_rules = [ id: 1, account: 1, order: 1, + enabled: true, folder: 'INBOX', filter_from: null, filter_to: null, @@ -36,6 +37,7 @@ const mail_rules = [ id: 2, account: 1, order: 1, + enabled: true, folder: 'INBOX', filter_from: null, filter_to: null, @@ -54,6 +56,7 @@ const mail_rules = [ id: 3, account: 1, order: 1, + enabled: true, folder: 'INBOX', filter_from: null, filter_to: null,