From 728c5ea07b2da0b87bb8a7ef9d1759fcb34eb0a0 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Feb 2026 16:40:48 +0000 Subject: [PATCH 1/4] Auto translate strings --- src-ui/messages.xlf | 86 ++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index bf56823d4..723d7691e 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -1209,7 +1209,7 @@ src/app/components/document-detail/document-detail.component.ts - 1481 + 1496 @@ -2798,11 +2798,11 @@ src/app/components/document-detail/document-detail.component.ts - 1116 + 1130 src/app/components/document-detail/document-detail.component.ts - 1482 + 1497 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -3393,7 +3393,7 @@ src/app/components/document-detail/document-detail.component.ts - 1069 + 1083 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -3498,7 +3498,7 @@ src/app/components/document-detail/document-detail.component.ts - 1533 + 1548 @@ -3509,7 +3509,7 @@ src/app/components/document-detail/document-detail.component.ts - 1534 + 1549 @@ -3520,7 +3520,7 @@ src/app/components/document-detail/document-detail.component.ts - 1535 + 1550 @@ -7656,56 +7656,56 @@ An error occurred loading content: src/app/components/document-detail/document-detail.component.ts - 434,436 + 448,450 Document changes detected src/app/components/document-detail/document-detail.component.ts - 473 + 487 The version of this document in your browser session appears older than the existing version. src/app/components/document-detail/document-detail.component.ts - 474 + 488 Saving the document here may overwrite other changes that were made. To restore the existing version, discard your changes or close the document. src/app/components/document-detail/document-detail.component.ts - 475 + 489 Ok src/app/components/document-detail/document-detail.component.ts - 477 + 491 Next document src/app/components/document-detail/document-detail.component.ts - 605 + 619 Previous document src/app/components/document-detail/document-detail.component.ts - 615 + 629 Close document src/app/components/document-detail/document-detail.component.ts - 623 + 637 src/app/services/open-documents.service.ts @@ -7716,67 +7716,67 @@ Save document src/app/components/document-detail/document-detail.component.ts - 630 + 644 Save and close / next src/app/components/document-detail/document-detail.component.ts - 639 + 653 Error retrieving metadata src/app/components/document-detail/document-detail.component.ts - 694 + 708 Error retrieving suggestions. src/app/components/document-detail/document-detail.component.ts - 749 + 763 Document "" saved successfully. src/app/components/document-detail/document-detail.component.ts - 958 + 972 src/app/components/document-detail/document-detail.component.ts - 982 + 996 Error saving document "" src/app/components/document-detail/document-detail.component.ts - 988 + 1002 Error saving document src/app/components/document-detail/document-detail.component.ts - 1038 + 1052 Do you really want to move the document "" to the trash? src/app/components/document-detail/document-detail.component.ts - 1070 + 1084 Documents can be restored prior to permanent deletion. src/app/components/document-detail/document-detail.component.ts - 1071 + 1085 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -7787,7 +7787,7 @@ Move to trash src/app/components/document-detail/document-detail.component.ts - 1073 + 1087 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -7798,14 +7798,14 @@ Error deleting document src/app/components/document-detail/document-detail.component.ts - 1092 + 1106 Reprocess confirm src/app/components/document-detail/document-detail.component.ts - 1112 + 1126 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -7816,102 +7816,102 @@ This operation will permanently recreate the archive file for this document. src/app/components/document-detail/document-detail.component.ts - 1113 + 1127 The archive file will be re-generated with the current settings. src/app/components/document-detail/document-detail.component.ts - 1114 + 1128 Reprocess operation for "" will begin in the background. Close and re-open or reload this document after the operation has completed to see new content. src/app/components/document-detail/document-detail.component.ts - 1124 + 1138 Error executing operation src/app/components/document-detail/document-detail.component.ts - 1135 + 1149 Error downloading document src/app/components/document-detail/document-detail.component.ts - 1184 + 1198 Page Fit src/app/components/document-detail/document-detail.component.ts - 1263 + 1278 PDF edit operation for "" will begin in the background. src/app/components/document-detail/document-detail.component.ts - 1500 + 1515 Error executing PDF edit operation src/app/components/document-detail/document-detail.component.ts - 1512 + 1527 Please enter the current password before attempting to remove it. src/app/components/document-detail/document-detail.component.ts - 1523 + 1538 Password removal operation for "" will begin in the background. src/app/components/document-detail/document-detail.component.ts - 1555 + 1570 Error executing password removal operation src/app/components/document-detail/document-detail.component.ts - 1569 + 1584 Print failed. src/app/components/document-detail/document-detail.component.ts - 1606 + 1621 Error loading document for printing. src/app/components/document-detail/document-detail.component.ts - 1618 + 1633 An error occurred loading tiff: src/app/components/document-detail/document-detail.component.ts - 1683 + 1698 src/app/components/document-detail/document-detail.component.ts - 1687 + 1702 From a467df0755af017c8998311dd9f92192a1ec5ed9 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 13 Feb 2026 09:33:29 -0800 Subject: [PATCH 2/4] Enhancement: option to stop processing further mail rules (#12053) --- .../mail-rule-edit-dialog.component.html | 15 +++++--- .../mail-rule-edit-dialog.component.ts | 1 + src-ui/src/app/data/mail-rule.ts | 2 + .../services/rest/mail-rule.service.spec.ts | 3 ++ src/paperless_mail/mail.py | 5 +++ .../0002_mailrule_stop_processing.py | 22 +++++++++++ src/paperless_mail/models.py | 8 ++++ src/paperless_mail/serialisers.py | 1 + src/paperless_mail/tests/test_mail.py | 37 ++++++++++++++++++- 9 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 src/paperless_mail/migrations/0002_mailrule_stop_processing.py 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 afe6c2ab9..0b06616fb 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 @@ -9,19 +9,24 @@
-
+
-
+
-
- -
+
+
+ +
+
+ +
+

Paperless will only process mails that match all of the criteria specified below.

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 dd5630bab..436569a08 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 @@ -222,6 +222,7 @@ export class MailRuleEditDialogComponent extends EditDialogComponent { ), assign_correspondent: new FormControl(null), assign_owner_from_rule: new FormControl(true), + stop_processing: new FormControl(false), }) } diff --git a/src-ui/src/app/data/mail-rule.ts b/src-ui/src/app/data/mail-rule.ts index 4c47b6500..6609810dd 100644 --- a/src-ui/src/app/data/mail-rule.ts +++ b/src-ui/src/app/data/mail-rule.ts @@ -84,4 +84,6 @@ export interface MailRule extends ObjectWithPermissions { assign_correspondent?: number // PaperlessCorrespondent.id assign_owner_from_rule: boolean + + stop_processing: boolean } 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 f2016d797..f5bef1ec0 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 @@ -33,6 +33,7 @@ const mail_rules = [ action: MailAction.MarkRead, assign_title_from: MailMetadataTitleOption.FromSubject, assign_owner_from_rule: true, + stop_processing: false, }, { name: 'Mail Rule 2', @@ -52,6 +53,7 @@ const mail_rules = [ action: MailAction.Delete, assign_title_from: MailMetadataTitleOption.FromSubject, assign_owner_from_rule: true, + stop_processing: false, }, { name: 'Mail Rule 3', @@ -71,6 +73,7 @@ const mail_rules = [ action: MailAction.Flag, assign_title_from: MailMetadataTitleOption.FromSubject, assign_owner_from_rule: false, + stop_processing: false, }, ] diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py index 8acd5d8ad..f6a46a292 100644 --- a/src/paperless_mail/mail.py +++ b/src/paperless_mail/mail.py @@ -575,6 +575,11 @@ class MailAccountHandler(LoggingMixin): rule, supports_gmail_labels=supports_gmail_labels, ) + if total_processed_files > 0 and rule.stop_processing: + self.log.debug( + f"Rule {rule}: Stopping processing rules due to stop_processing flag", + ) + break except Exception as e: self.log.exception( f"Rule {rule}: Error while processing rule: {e}", diff --git a/src/paperless_mail/migrations/0002_mailrule_stop_processing.py b/src/paperless_mail/migrations/0002_mailrule_stop_processing.py new file mode 100644 index 000000000..0f92e7d2f --- /dev/null +++ b/src/paperless_mail/migrations/0002_mailrule_stop_processing.py @@ -0,0 +1,22 @@ +# Generated by Django 5.1.6 on 2025-02-24 16:07 + +from django.db import migrations +from django.db import models + + +class Migration(migrations.Migration): + dependencies = [ + ("paperless_mail", "0001_initial"), + ] + + operations = [ + migrations.AddField( + model_name="mailrule", + name="stop_processing", + field=models.BooleanField( + default=False, + help_text="If True, no further rules will be processed after this one if any document is consumed.", + verbose_name="Stop processing further rules", + ), + ), + ] diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py index 08906e00c..c4dd3eaa6 100644 --- a/src/paperless_mail/models.py +++ b/src/paperless_mail/models.py @@ -301,6 +301,14 @@ class MailRule(document_models.ModelWithOwner): default=True, ) + stop_processing = models.BooleanField( + _("Stop processing further rules"), + default=False, + help_text=_( + "If True, no further rules will be processed after this one if any document is queued.", + ), + ) + def __str__(self): return f"{self.account.name}.{self.name}" diff --git a/src/paperless_mail/serialisers.py b/src/paperless_mail/serialisers.py index b38c8e78c..d7354e9e4 100644 --- a/src/paperless_mail/serialisers.py +++ b/src/paperless_mail/serialisers.py @@ -102,6 +102,7 @@ class MailRuleSerializer(OwnedObjectSerializer): "user_can_change", "permissions", "set_permissions", + "stop_processing", ] def update(self, instance, validated_data): diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py index 51a1929ab..4dffd677e 100644 --- a/src/paperless_mail/tests/test_mail.py +++ b/src/paperless_mail/tests/test_mail.py @@ -1692,6 +1692,39 @@ class TestTasks(TestCase): result = tasks.process_mail_accounts(account_ids=[account_b.id]) self.assertIn("No new", result) + @mock.patch("paperless_mail.tasks.MailAccountHandler.handle_mail_account") + def test_rule_with_stop_processing(self, m): + """ + GIVEN: + - Mail account with a rule with stop_processing=True + WHEN: + - Mail account is processed + THEN: + - Should only process the first rule + """ + m.side_effect = lambda account: 6 + + account = MailAccount.objects.create( + name="A", + imap_server="A", + username="A", + password="A", + ) + MailRule.objects.create( + name="A", + account=account, + stop_processing=True, + ) + MailRule.objects.create( + name="B", + account=account, + ) + + result = tasks.process_mail_accounts() + + self.assertEqual(m.call_count, 1) + self.assertIn("Added 6", result) + class TestMailAccountTestView(APITestCase): def setUp(self) -> None: @@ -1777,8 +1810,8 @@ class TestMailAccountTestView(APITestCase): ) def test_mail_account_test_view_refresh_token_fails( self, - mock_mock_refresh_account_oauth_token, - ): + mock_mock_refresh_account_oauth_token: mock.MagicMock, + ) -> None: """ GIVEN: - Mail account with expired token From b050fab77ff00352de6a19edc7d2ae389497657f Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 13 Feb 2026 09:36:12 -0800 Subject: [PATCH 3/4] Enhancement: consolidate management lists into document attributes section (#12045) --- src-ui/e2e/dashboard/dashboard.spec.ts | 4 +- .../permissions/global-permissions.spec.ts | 18 +- src-ui/src/app/app-routing.module.ts | 105 +++---- src-ui/src/app/app.component.ts | 4 +- .../app-frame/app-frame.component.html | 92 ++++--- .../app-frame/app-frame.component.scss | 9 + .../app-frame/app-frame.component.spec.ts | 106 +++++++- .../app-frame/app-frame.component.ts | 61 ++++- .../custom-fields.component.html | 12 - .../custom-fields.component.scss | 0 .../custom-fields.component.spec.ts | 11 +- .../custom-fields/custom-fields.component.ts | 26 +- .../document-attributes.component.html | 78 ++++++ .../document-attributes.component.scss | 0 .../document-attributes.component.spec.ts | 189 +++++++++++++ .../document-attributes.component.ts | 256 ++++++++++++++++++ .../correspondent-list.component.spec.ts | 2 +- .../correspondent-list.component.ts | 17 +- .../document-type-list.component.spec.ts | 2 +- .../document-type-list.component.ts | 15 +- .../management-list.component.html | 71 +---- .../management-list.component.scss | 0 .../management-list.component.spec.ts | 14 +- .../management-list.component.ts | 33 +-- .../storage-path-list.component.spec.ts | 2 +- .../storage-path-list.component.ts | 15 +- .../tag-list/tag-list.component.spec.ts | 6 +- .../tag-list/tag-list.component.ts | 15 +- src-ui/src/app/data/ui-settings.ts | 11 + .../src/app/guards/permissions.guard.spec.ts | 48 ++++ src-ui/src/app/guards/permissions.guard.ts | 8 + src-ui/src/main.ts | 2 + 32 files changed, 969 insertions(+), 263 deletions(-) rename src-ui/src/app/components/manage/{ => document-attributes}/custom-fields/custom-fields.component.html (88%) rename src-ui/src/app/components/manage/{ => document-attributes}/custom-fields/custom-fields.component.scss (100%) rename src-ui/src/app/components/manage/{ => document-attributes}/custom-fields/custom-fields.component.spec.ts (92%) rename src-ui/src/app/components/manage/{ => document-attributes}/custom-fields/custom-fields.component.ts (82%) create mode 100644 src-ui/src/app/components/manage/document-attributes/document-attributes.component.html create mode 100644 src-ui/src/app/components/manage/document-attributes/document-attributes.component.scss create mode 100644 src-ui/src/app/components/manage/document-attributes/document-attributes.component.spec.ts create mode 100644 src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts rename src-ui/src/app/components/manage/{ => document-attributes/management-list}/correspondent-list/correspondent-list.component.spec.ts (97%) rename src-ui/src/app/components/manage/{ => document-attributes/management-list}/correspondent-list/correspondent-list.component.ts (77%) rename src-ui/src/app/components/manage/{ => document-attributes/management-list}/document-type-list/document-type-list.component.spec.ts (96%) rename src-ui/src/app/components/manage/{ => document-attributes/management-list}/document-type-list/document-type-list.component.ts (70%) rename src-ui/src/app/components/manage/{ => document-attributes}/management-list/management-list.component.html (64%) rename src-ui/src/app/components/manage/{ => document-attributes}/management-list/management-list.component.scss (100%) rename src-ui/src/app/components/manage/{ => document-attributes}/management-list/management-list.component.spec.ts (97%) rename src-ui/src/app/components/manage/{ => document-attributes}/management-list/management-list.component.ts (91%) rename src-ui/src/app/components/manage/{ => document-attributes/management-list}/storage-path-list/storage-path-list.component.spec.ts (96%) rename src-ui/src/app/components/manage/{ => document-attributes/management-list}/storage-path-list/storage-path-list.component.ts (73%) rename src-ui/src/app/components/manage/{ => document-attributes/management-list}/tag-list/tag-list.component.spec.ts (96%) rename src-ui/src/app/components/manage/{ => document-attributes/management-list}/tag-list/tag-list.component.ts (79%) diff --git a/src-ui/e2e/dashboard/dashboard.spec.ts b/src-ui/e2e/dashboard/dashboard.spec.ts index 2ee8c1f35..801f431f3 100644 --- a/src-ui/e2e/dashboard/dashboard.spec.ts +++ b/src-ui/e2e/dashboard/dashboard.spec.ts @@ -52,11 +52,11 @@ test('dashboard saved view document links', async ({ page }) => { test('test slim sidebar', async ({ page }) => { await page.routeFromHAR(REQUESTS_HAR1, { notFound: 'fallback' }) await page.goto('/dashboard') - await page.locator('#sidebarMenu').getByRole('button').click() + await page.locator('.sidebar-slim-toggler').click() await expect( page.getByRole('link', { name: 'Dashboard' }).getByText('Dashboard') ).toBeHidden() - await page.locator('#sidebarMenu').getByRole('button').click() + await page.locator('.sidebar-slim-toggler').click() await expect( page.getByRole('link', { name: 'Dashboard' }).getByText('Dashboard') ).toBeVisible() diff --git a/src-ui/e2e/permissions/global-permissions.spec.ts b/src-ui/e2e/permissions/global-permissions.spec.ts index e5bc98edf..7021b6d9b 100644 --- a/src-ui/e2e/permissions/global-permissions.spec.ts +++ b/src-ui/e2e/permissions/global-permissions.spec.ts @@ -33,9 +33,9 @@ test('should not allow user to view correspondents', async ({ page }) => { await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' }) await page.goto('/dashboard') await expect( - page.getByRole('link', { name: 'Correspondents' }) + page.getByRole('link', { name: 'Attributes' }) ).not.toBeAttached() - await page.goto('/correspondents') + await page.goto('/attributes/correspondents') await expect(page.locator('body')).toHaveText( /You don't have permissions to do that/i ) @@ -44,8 +44,10 @@ test('should not allow user to view correspondents', async ({ page }) => { test('should not allow user to view tags', async ({ page }) => { await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' }) await page.goto('/dashboard') - await expect(page.getByRole('link', { name: 'Tags' })).not.toBeAttached() - await page.goto('/tags') + await expect( + page.getByRole('link', { name: 'Attributes' }) + ).not.toBeAttached() + await page.goto('/attributes/tags') await expect(page.locator('body')).toHaveText( /You don't have permissions to do that/i ) @@ -55,9 +57,9 @@ test('should not allow user to view document types', async ({ page }) => { await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' }) await page.goto('/dashboard') await expect( - page.getByRole('link', { name: 'Document Types' }) + page.getByRole('link', { name: 'Attributes' }) ).not.toBeAttached() - await page.goto('/documenttypes') + await page.goto('/attributes/documenttypes') await expect(page.locator('body')).toHaveText( /You don't have permissions to do that/i ) @@ -67,9 +69,9 @@ test('should not allow user to view storage paths', async ({ page }) => { await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' }) await page.goto('/dashboard') await expect( - page.getByRole('link', { name: 'Storage Paths' }) + page.getByRole('link', { name: 'Attributes' }) ).not.toBeAttached() - await page.goto('/storagepaths') + await page.goto('/attributes/storagepaths') await expect(page.locator('body')).toHaveText( /You don't have permissions to do that/i ) diff --git a/src-ui/src/app/app-routing.module.ts b/src-ui/src/app/app-routing.module.ts index f65514f74..66864a0d5 100644 --- a/src-ui/src/app/app-routing.module.ts +++ b/src-ui/src/app/app-routing.module.ts @@ -11,13 +11,9 @@ import { DashboardComponent } from './components/dashboard/dashboard.component' import { DocumentAsnComponent } from './components/document-asn/document-asn.component' import { DocumentDetailComponent } from './components/document-detail/document-detail.component' import { DocumentListComponent } from './components/document-list/document-list.component' -import { CorrespondentListComponent } from './components/manage/correspondent-list/correspondent-list.component' -import { CustomFieldsComponent } from './components/manage/custom-fields/custom-fields.component' -import { DocumentTypeListComponent } from './components/manage/document-type-list/document-type-list.component' +import { DocumentAttributesComponent } from './components/manage/document-attributes/document-attributes.component' import { MailComponent } from './components/manage/mail/mail.component' import { SavedViewsComponent } from './components/manage/saved-views/saved-views.component' -import { StoragePathListComponent } from './components/manage/storage-path-list/storage-path-list.component' -import { TagListComponent } from './components/manage/tag-list/tag-list.component' import { WorkflowsComponent } from './components/manage/workflows/workflows.component' import { NotFoundComponent } from './components/not-found/not-found.component' import { DirtyDocGuard } from './guards/dirty-doc.guard' @@ -106,52 +102,76 @@ export const routes: Routes = [ }, }, { - path: 'tags', - component: TagListComponent, + path: 'attributes', + component: DocumentAttributesComponent, canActivate: [PermissionsGuard], data: { - requiredPermission: { - action: PermissionAction.View, - type: PermissionType.Tag, - }, - componentName: 'TagListComponent', + requiredPermissionAny: [ + { action: PermissionAction.View, type: PermissionType.Tag }, + { + action: PermissionAction.View, + type: PermissionType.Correspondent, + }, + { + action: PermissionAction.View, + type: PermissionType.DocumentType, + }, + { action: PermissionAction.View, type: PermissionType.StoragePath }, + { action: PermissionAction.View, type: PermissionType.CustomField }, + ], + componentName: 'DocumentAttributesComponent', }, }, { - path: 'documenttypes', - component: DocumentTypeListComponent, + path: 'attributes/:section', + component: DocumentAttributesComponent, canActivate: [PermissionsGuard], data: { - requiredPermission: { - action: PermissionAction.View, - type: PermissionType.DocumentType, - }, - componentName: 'DocumentTypeListComponent', + requiredPermissionAny: [ + { action: PermissionAction.View, type: PermissionType.Tag }, + { + action: PermissionAction.View, + type: PermissionType.Correspondent, + }, + { + action: PermissionAction.View, + type: PermissionType.DocumentType, + }, + { action: PermissionAction.View, type: PermissionType.StoragePath }, + { action: PermissionAction.View, type: PermissionType.CustomField }, + ], + componentName: 'DocumentAttributesComponent', }, }, + { + path: 'documentproperties', + redirectTo: '/attributes', + pathMatch: 'full', + }, + { + path: 'documentproperties/:section', + redirectTo: '/attributes/:section', + pathMatch: 'full', + }, + { + path: 'tags', + redirectTo: '/attributes/tags', + pathMatch: 'full', + }, { path: 'correspondents', - component: CorrespondentListComponent, - canActivate: [PermissionsGuard], - data: { - requiredPermission: { - action: PermissionAction.View, - type: PermissionType.Correspondent, - }, - componentName: 'CorrespondentListComponent', - }, + redirectTo: '/attributes/correspondents', + pathMatch: 'full', + }, + { + path: 'documenttypes', + redirectTo: '/attributes/documenttypes', + pathMatch: 'full', }, { path: 'storagepaths', - component: StoragePathListComponent, - canActivate: [PermissionsGuard], - data: { - requiredPermission: { - action: PermissionAction.View, - type: PermissionType.StoragePath, - }, - componentName: 'StoragePathListComponent', - }, + redirectTo: '/attributes/storagepaths', + pathMatch: 'full', }, { path: 'logs', @@ -239,15 +259,8 @@ export const routes: Routes = [ }, { path: 'customfields', - component: CustomFieldsComponent, - canActivate: [PermissionsGuard], - data: { - requiredPermission: { - action: PermissionAction.View, - type: PermissionType.CustomField, - }, - componentName: 'CustomFieldsComponent', - }, + redirectTo: '/attributes/customfields', + pathMatch: 'full', }, { path: 'workflows', diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts index 818f8eab0..543d2ecaa 100644 --- a/src-ui/src/app/app.component.ts +++ b/src-ui/src/app/app.component.ts @@ -195,8 +195,8 @@ export class AppComponent implements OnInit, OnDestroy { }, { anchorId: 'tour.tags', - content: $localize`Tags, correspondents, document types and storage paths can all be managed using these pages. They can also be created from the document edit view.`, - route: '/tags', + content: $localize`Attributes like tags, correspondents, document types, storage paths and custom fields can all be managed here. They can also be created from the document edit view.`, + route: '/attributes/tags', backdropConfig: { offset: 0, }, diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 62a2e16cc..13bf9069c 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -175,44 +175,60 @@ Manage
    -
  • - -  Correspondents - -
    • -
  • - -  Tags - -
    • -
  • - -  Document Types - -
    • -
  • - -  Storage Paths - -
    • -
  • - -  Custom Fields - -
    • + @if (canManageAttributes) { +
  • +
    + +  Attributes + + @if (!slimSidebarEnabled) { + + } +
    +
    + +
    +
    • + }
  • { const toastSpy = jest.spyOn(toastService, 'showError') component.toggleSlimSidebar() httpTestingController - .expectOne(`${environment.apiBaseUrl}ui_settings/`) + .match(`${environment.apiBaseUrl}ui_settings/`)[0] .flush('error', { status: 500, statusText: 'error', @@ -373,4 +376,103 @@ describe('AppFrameComponent', () => { it('should call maybeRefreshDocumentCounts after saved views reload', () => { expect(maybeRefreshSpy).toHaveBeenCalled() }) + + it('should indicate attributes management availability when any permission is granted', () => { + jest + .spyOn(permissionsService, 'currentUserCan') + .mockImplementation((action, type) => { + return type === PermissionType.Tag + }) + + expect(component.canManageAttributes).toBe(true) + }) + + it('should indicate attributes management availability for other permission types', () => { + const canSpy = jest + .spyOn(permissionsService, 'currentUserCan') + .mockImplementation((action, type) => { + return type === PermissionType.Correspondent + }) + expect(component.canManageAttributes).toBe(true) + + canSpy.mockImplementation((action, type) => { + return type === PermissionType.DocumentType + }) + expect(component.canManageAttributes).toBe(true) + + canSpy.mockImplementation((action, type) => { + return type === PermissionType.StoragePath + }) + expect(component.canManageAttributes).toBe(true) + + canSpy.mockImplementation((action, type) => { + return type === PermissionType.CustomField + }) + expect(component.canManageAttributes).toBe(true) + }) + + it('should toggle attributes sections and stop event bubbling', () => { + const preventDefault = jest.fn() + const stopPropagation = jest.fn() + const setSpy = jest.spyOn(settingsService, 'set') + jest.spyOn(settingsService, 'storeSettings').mockReturnValue(of(true)) + + component.toggleAttributesSections({ + preventDefault, + stopPropagation, + } as any) + + expect(preventDefault).toHaveBeenCalled() + expect(stopPropagation).toHaveBeenCalled() + expect(setSpy).toHaveBeenCalledWith( + SETTINGS_KEYS.ATTRIBUTES_SECTIONS_COLLAPSED, + ['attributes'] + ) + }) + + it('should show error when saving slim sidebar setting fails', () => { + const toastSpy = jest.spyOn(toastService, 'showError') + jest.spyOn(console, 'warn').mockImplementation(() => {}) + jest + .spyOn(settingsService, 'storeSettings') + .mockReturnValue(throwError(() => new Error('boom'))) + + component.slimSidebarEnabled = true + + expect(toastSpy).toHaveBeenCalled() + }) + + it('should show error when saving attributes collapsed setting fails', () => { + const toastSpy = jest.spyOn(toastService, 'showError') + jest.spyOn(console, 'warn').mockImplementation(() => {}) + jest + .spyOn(settingsService, 'storeSettings') + .mockReturnValue(throwError(() => new Error('boom'))) + + component.attributesSectionsCollapsed = true + + expect(toastSpy).toHaveBeenCalled() + }) + + it('should persist attributes section collapse state', () => { + const setSpy = jest.spyOn(settingsService, 'set') + jest.spyOn(settingsService, 'storeSettings').mockReturnValue(of(true)) + + component.attributesSectionsCollapsed = true + + expect(setSpy).toHaveBeenCalledWith( + SETTINGS_KEYS.ATTRIBUTES_SECTIONS_COLLAPSED, + ['attributes'] + ) + }) + + it('should collapse attributes sections when enabling slim sidebar', () => { + jest.spyOn(settingsService, 'storeSettings').mockReturnValue(of(true)) + settingsService.set(SETTINGS_KEYS.ATTRIBUTES_SECTIONS_COLLAPSED, []) + settingsService.set(SETTINGS_KEYS.SLIM_SIDEBAR, false) + + component.toggleSlimSidebar() + + expect(component.attributesSectionsCollapsed).toBe(true) + }) }) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 0aff40b01..a063c5095 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -21,7 +21,7 @@ import { Observable } from 'rxjs' import { first } from 'rxjs/operators' import { Document } from 'src/app/data/document' import { SavedView } from 'src/app/data/saved-view' -import { SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { CollapsibleSection, SETTINGS_KEYS } from 'src/app/data/ui-settings' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { ComponentCanDeactivate } from 'src/app/guards/dirty-doc.guard' import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe' @@ -141,11 +141,20 @@ export class AppFrameComponent toggleSlimSidebar(): void { this.slimSidebarAnimating = true this.slimSidebarEnabled = !this.slimSidebarEnabled + if (this.slimSidebarEnabled) { + this.attributesSectionsCollapsed = true + } setTimeout(() => { this.slimSidebarAnimating = false }, 200) // slightly longer than css animation for slim sidebar } + toggleAttributesSections(event?: Event): void { + event?.preventDefault() + event?.stopPropagation() + this.attributesSectionsCollapsed = !this.attributesSectionsCollapsed + } + get versionString(): string { return `${environment.appTitle} v${this.settingsService.get(SETTINGS_KEYS.VERSION)}${environment.tag === 'prod' ? '' : ` #${environment.tag}`}` } @@ -167,6 +176,31 @@ export class AppFrameComponent ) } + get canManageAttributes(): boolean { + return ( + this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.Tag + ) || + this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.Correspondent + ) || + this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.DocumentType + ) || + this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.StoragePath + ) || + this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.CustomField + ) + ) + } + get slimSidebarEnabled(): boolean { return this.settingsService.get(SETTINGS_KEYS.SLIM_SIDEBAR) } @@ -186,6 +220,31 @@ export class AppFrameComponent }) } + get attributesSectionsCollapsed(): boolean { + return this.settingsService + .get(SETTINGS_KEYS.ATTRIBUTES_SECTIONS_COLLAPSED) + ?.includes(CollapsibleSection.ATTRIBUTES) + } + + set attributesSectionsCollapsed(collapsed: boolean) { + // TODO: refactor to be able to toggle individual sections, if implemented + this.settingsService.set( + SETTINGS_KEYS.ATTRIBUTES_SECTIONS_COLLAPSED, + collapsed ? [CollapsibleSection.ATTRIBUTES] : [] + ) + this.settingsService + .storeSettings() + .pipe(first()) + .subscribe({ + error: (error) => { + this.toastService.showError( + $localize`An error occurred while saving settings.` + ) + console.warn(error) + }, + }) + } + get aiEnabled(): boolean { return this.settingsService.get(SETTINGS_KEYS.AI_ENABLED) } diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html similarity index 88% rename from src-ui/src/app/components/manage/custom-fields/custom-fields.component.html rename to src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html index 0a6d80658..635201f76 100644 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html +++ b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html @@ -1,15 +1,3 @@ - - - -
    • diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.scss b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.scss similarity index 100% rename from src-ui/src/app/components/manage/custom-fields/custom-fields.component.scss rename to src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.scss diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts similarity index 92% rename from src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts rename to src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts index b86d476f3..96eaab503 100644 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts @@ -26,9 +26,9 @@ import { PermissionsService } from 'src/app/services/permissions.service' import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' -import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' -import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' +import { ConfirmDialogComponent } from '../../../common/confirm-dialog/confirm-dialog.component' +import { CustomFieldEditDialogComponent } from '../../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' +import { PageHeaderComponent } from '../../../common/page-header/page-header.component' import { CustomFieldsComponent } from './custom-fields.component' const fields: CustomField[] = [ @@ -110,10 +110,7 @@ describe('CustomFieldsComponent', () => { const toastInfoSpy = jest.spyOn(toastService, 'showInfo') const reloadSpy = jest.spyOn(component, 'reload') - const createButton = fixture.debugElement - .queryAll(By.css('button')) - .find((btn) => btn.nativeElement.textContent.trim().includes('Add Field')) - createButton.triggerEventHandler('click') + component.editField() expect(modal).not.toBeUndefined() const editDialog = modal.componentInstance as CustomFieldEditDialogComponent diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts similarity index 82% rename from src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts rename to src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts index 8ecd713ef..9b9eb98bf 100644 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts @@ -7,6 +7,10 @@ import { } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { delay, takeUntil, tap } from 'rxjs' +import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component' +import { CustomFieldEditDialogComponent } from 'src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' +import { EditDialogMode } from 'src/app/components/common/edit-dialog/edit-dialog.component' +import { LoadingComponentWithPermissions } from 'src/app/components/loading-component/loading.component' import { CustomField, DATA_TYPE_LABELS } from 'src/app/data/custom-field' import { CustomFieldQueryLogicalOperator, @@ -21,18 +25,12 @@ import { DocumentService } from 'src/app/services/rest/document.service' import { SavedViewService } from 'src/app/services/rest/saved-view.service' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' -import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' -import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' -import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { LoadingComponentWithPermissions } from '../../loading-component/loading.component' @Component({ selector: 'pngx-custom-fields', templateUrl: './custom-fields.component.html', styleUrls: ['./custom-fields.component.scss'], imports: [ - PageHeaderComponent, IfPermissionsDirective, NgbDropdownModule, NgbPaginationModule, @@ -44,14 +42,14 @@ export class CustomFieldsComponent extends LoadingComponentWithPermissions implements OnInit { - private customFieldsService = inject(CustomFieldsService) - permissionsService = inject(PermissionsService) - private modalService = inject(NgbModal) - private toastService = inject(ToastService) - private documentListViewService = inject(DocumentListViewService) - private settingsService = inject(SettingsService) - private documentService = inject(DocumentService) - private savedViewService = inject(SavedViewService) + private readonly customFieldsService = inject(CustomFieldsService) + public readonly permissionsService = inject(PermissionsService) + private readonly modalService = inject(NgbModal) + private readonly toastService = inject(ToastService) + private readonly documentListViewService = inject(DocumentListViewService) + private readonly settingsService = inject(SettingsService) + private readonly documentService = inject(DocumentService) + private readonly savedViewService = inject(SavedViewService) public fields: CustomField[] = [] diff --git a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html new file mode 100644 index 000000000..1aa105b9d --- /dev/null +++ b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html @@ -0,0 +1,78 @@ + + @if (activeManagementList) { +
      + +
      + + + +
      +
      + +
      +
      + Select: +
      +
      + @if (activeManagementList.selectedObjects.size > 0) { + + } + + +
      +
      + + + + + } @else if (activeCustomFields) { + + } +       + +       + +
      + +
      diff --git a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.scss b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.spec.ts new file mode 100644 index 000000000..54017a7e0 --- /dev/null +++ b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.spec.ts @@ -0,0 +1,189 @@ +import { Component } from '@angular/core' +import { ComponentFixture, TestBed } from '@angular/core/testing' +import { + ActivatedRoute, + convertToParamMap, + ParamMap, + Router, +} from '@angular/router' +import { RouterTestingModule } from '@angular/router/testing' +import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { Subject } from 'rxjs' +import { + PermissionAction, + PermissionsService, + PermissionType, +} from 'src/app/services/permissions.service' +import { + DocumentAttributesComponent, + DocumentAttributesSectionKind, +} from './document-attributes.component' + +@Component({ + selector: 'pngx-dummy-section', + template: '', + standalone: true, +}) +class DummySectionComponent {} + +describe('DocumentAttributesComponent', () => { + let component: DocumentAttributesComponent + let fixture: ComponentFixture + let router: Router + let paramMapSubject: Subject + let permissionsService: PermissionsService + + beforeEach(async () => { + paramMapSubject = new Subject() + + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule, + NgxBootstrapIconsModule.pick(allIcons), + DocumentAttributesComponent, + DummySectionComponent, + ], + providers: [ + { + provide: ActivatedRoute, + useValue: { + paramMap: paramMapSubject.asObservable(), + }, + }, + { + provide: PermissionsService, + useValue: { + currentUserCan: jest.fn(), + }, + }, + ], + }).compileComponents() + + fixture = TestBed.createComponent(DocumentAttributesComponent) + component = fixture.componentInstance + router = TestBed.inject(Router) + permissionsService = TestBed.inject(PermissionsService) + + jest.spyOn(router, 'navigate').mockResolvedValue(true) + ;(component as any).sections = [ + { + id: 1, + path: 'tags', + label: 'Tags', + icon: 'tags', + permissionType: PermissionType.Tag, + kind: DocumentAttributesSectionKind.ManagementList, + component: DummySectionComponent, + }, + { + id: 2, + path: 'customfields', + label: 'Custom fields', + icon: 'ui-radios', + permissionType: PermissionType.CustomField, + kind: DocumentAttributesSectionKind.CustomFields, + component: DummySectionComponent, + }, + ] + }) + + it('should navigate to default section when no section is provided', () => { + jest + .spyOn(permissionsService, 'currentUserCan') + .mockImplementation((action, type) => { + return action === PermissionAction.View && type === PermissionType.Tag + }) + + fixture.detectChanges() + paramMapSubject.next(convertToParamMap({})) + + expect(router.navigate).toHaveBeenCalledWith(['attributes', 'tags'], { + replaceUrl: true, + }) + expect(component.activeNavID).toBe(1) + }) + + it('should set active section from route param when valid', () => { + jest + .spyOn(permissionsService, 'currentUserCan') + .mockImplementation((action, type) => { + return ( + action === PermissionAction.View && + type === PermissionType.CustomField + ) + }) + + fixture.detectChanges() + paramMapSubject.next(convertToParamMap({ section: 'customfields' })) + + expect(component.activeNavID).toBe(2) + expect(router.navigate).not.toHaveBeenCalled() + }) + + it('should update active nav id when route section changes', () => { + jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) + + fixture.detectChanges() + component.activeNavID = 1 + paramMapSubject.next(convertToParamMap({ section: 'customfields' })) + + expect(component.activeNavID).toBe(2) + }) + + it('should redirect to dashboard when no sections are visible', () => { + jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(false) + + fixture.detectChanges() + paramMapSubject.next(convertToParamMap({})) + + expect(router.navigate).toHaveBeenCalledWith(['/dashboard'], { + replaceUrl: true, + }) + }) + + it('should navigate when a nav change occurs', () => { + jest + .spyOn(permissionsService, 'currentUserCan') + .mockImplementation(() => true) + + fixture.detectChanges() + paramMapSubject.next(convertToParamMap({ section: 'tags' })) + + component.onNavChange({ nextId: 2 } as any) + + expect(router.navigate).toHaveBeenCalledWith(['attributes', 'customfields']) + }) + + it('should ignore nav changes for unknown sections', () => { + jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) + + fixture.detectChanges() + paramMapSubject.next(convertToParamMap({ section: 'tags' })) + + component.onNavChange({ nextId: 999 } as any) + + expect(router.navigate).not.toHaveBeenCalled() + }) + + it('should return activeManagementList correctly', () => { + jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) + expect(component.activeManagementList).toBeNull() + + component.activeNavID = 1 + expect(component.activeSection.kind).toBe( + DocumentAttributesSectionKind.ManagementList + ) + expect(component.activeManagementList).toBeDefined() + }) + + it('should return activeCustomFields correctly', () => { + jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) + expect(component.activeCustomFields).toBeNull() + + component.activeNavID = 2 + expect(component.activeSection.kind).toBe( + DocumentAttributesSectionKind.CustomFields + ) + expect(component.activeCustomFields).toBeDefined() + }) +}) diff --git a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts new file mode 100644 index 000000000..8396ca6b2 --- /dev/null +++ b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts @@ -0,0 +1,256 @@ +import { NgComponentOutlet } from '@angular/common' +import { + AfterViewChecked, + ChangeDetectorRef, + Component, + inject, + OnDestroy, + OnInit, + Type, + ViewChild, +} from '@angular/core' +import { ActivatedRoute, Router } from '@angular/router' +import { + NgbDropdownModule, + NgbNavChangeEvent, + NgbNavModule, +} from '@ng-bootstrap/ng-bootstrap' +import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { Subject, takeUntil } from 'rxjs' +import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' +import { + PermissionAction, + PermissionsService, + PermissionType, +} from 'src/app/services/permissions.service' +import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component' +import { PageHeaderComponent } from '../../common/page-header/page-header.component' +import { CustomFieldsComponent } from './custom-fields/custom-fields.component' +import { CorrespondentListComponent } from './management-list/correspondent-list/correspondent-list.component' +import { DocumentTypeListComponent } from './management-list/document-type-list/document-type-list.component' +import { ManagementListComponent } from './management-list/management-list.component' +import { StoragePathListComponent } from './management-list/storage-path-list/storage-path-list.component' +import { TagListComponent } from './management-list/tag-list/tag-list.component' + +enum DocumentAttributesNavIDs { + Tags = 1, + Correspondents = 2, + DocumentTypes = 3, + StoragePaths = 4, + CustomFields = 5, +} + +export enum DocumentAttributesSectionKind { + ManagementList = 'managementList', + CustomFields = 'customFields', +} + +interface DocumentAttributesSection { + id: DocumentAttributesNavIDs + path: string + label: string + icon: string + infoLink?: string + permissionType: PermissionType + kind: DocumentAttributesSectionKind + component: Type +} + +@Component({ + selector: 'pngx-document-attributes', + templateUrl: './document-attributes.component.html', + styleUrls: ['./document-attributes.component.scss'], + imports: [ + PageHeaderComponent, + NgbNavModule, + NgbDropdownModule, + NgComponentOutlet, + NgxBootstrapIconsModule, + IfPermissionsDirective, + ClearableBadgeComponent, + ], +}) +export class DocumentAttributesComponent + implements OnInit, OnDestroy, AfterViewChecked +{ + private readonly permissionsService = inject(PermissionsService) + private readonly activatedRoute = inject(ActivatedRoute) + private readonly router = inject(Router) + private readonly cdr = inject(ChangeDetectorRef) + private readonly unsubscribeNotifier = new Subject() + + protected readonly PermissionAction = PermissionAction + protected readonly PermissionType = PermissionType + + readonly sections: DocumentAttributesSection[] = [ + { + id: DocumentAttributesNavIDs.Tags, + path: 'tags', + label: $localize`Tags`, + icon: 'tags', + infoLink: 'usage/#terms-and-definitions', + permissionType: PermissionType.Tag, + kind: DocumentAttributesSectionKind.ManagementList, + component: TagListComponent, + }, + { + id: DocumentAttributesNavIDs.Correspondents, + path: 'correspondents', + label: $localize`Correspondents`, + icon: 'person', + infoLink: 'usage/#terms-and-definitions', + permissionType: PermissionType.Correspondent, + kind: DocumentAttributesSectionKind.ManagementList, + component: CorrespondentListComponent, + }, + { + id: DocumentAttributesNavIDs.DocumentTypes, + path: 'documenttypes', + label: $localize`Document types`, + icon: 'hash', + infoLink: 'usage/#terms-and-definitions', + permissionType: PermissionType.DocumentType, + kind: DocumentAttributesSectionKind.ManagementList, + component: DocumentTypeListComponent, + }, + { + id: DocumentAttributesNavIDs.StoragePaths, + path: 'storagepaths', + label: $localize`Storage paths`, + icon: 'folder', + infoLink: 'usage/#terms-and-definitions', + permissionType: PermissionType.StoragePath, + kind: DocumentAttributesSectionKind.ManagementList, + component: StoragePathListComponent, + }, + { + id: DocumentAttributesNavIDs.CustomFields, + path: 'customfields', + label: $localize`Custom fields`, + icon: 'ui-radios', + infoLink: 'usage/#custom-fields', + permissionType: PermissionType.CustomField, + kind: DocumentAttributesSectionKind.CustomFields, + component: CustomFieldsComponent, + }, + ] + + @ViewChild('activeOutlet', { read: NgComponentOutlet }) + private readonly activeOutlet?: NgComponentOutlet + + private lastHeaderLoading: boolean + + activeNavID: number = null + + get visibleSections(): DocumentAttributesSection[] { + return this.sections.filter((section) => + this.permissionsService.currentUserCan( + PermissionAction.View, + section.permissionType + ) + ) + } + + get activeSection(): DocumentAttributesSection | null { + return ( + this.visibleSections.find((section) => section.id === this.activeNavID) ?? + null + ) + } + + get activeManagementList(): ManagementListComponent | null { + if ( + this.activeSection?.kind !== DocumentAttributesSectionKind.ManagementList + ) + return null + const instance = this.activeOutlet?.componentInstance + return instance instanceof ManagementListComponent ? instance : null + } + + get activeCustomFields(): CustomFieldsComponent | null { + if (this.activeSection?.kind !== DocumentAttributesSectionKind.CustomFields) + return null + const instance = this.activeOutlet?.componentInstance + return instance instanceof CustomFieldsComponent ? instance : null + } + + get activeTabLabel(): string { + return this.activeSection?.label ?? '' + } + + get activeInfoLink(): string { + return this.activeSection?.infoLink ?? null + } + + get activeHeaderLoading(): boolean { + return ( + this.activeManagementList?.loading ?? + this.activeCustomFields?.loading ?? + false + ) + } + + ngOnInit(): void { + this.activatedRoute.paramMap + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe((paramMap) => { + const section = paramMap.get('section') + const navIDFromSection = + this.getNavIDForSection(section) ?? this.getDefaultNavID() + + if (navIDFromSection == null) { + this.router.navigate(['/dashboard'], { replaceUrl: true }) + return + } + + if (this.activeNavID !== navIDFromSection) { + this.activeNavID = navIDFromSection + } + + if (!section || this.getNavIDForSection(section) == null) { + this.router.navigate( + ['attributes', this.getSectionForNavID(this.activeNavID)], + { replaceUrl: true } + ) + } + }) + } + + ngOnDestroy(): void { + this.unsubscribeNotifier.next() + this.unsubscribeNotifier.complete() + } + + ngAfterViewChecked(): void { + const current = this.activeHeaderLoading + if (this.lastHeaderLoading !== current) { + this.lastHeaderLoading = current + this.cdr.detectChanges() + } + } + + onNavChange(navChangeEvent: NgbNavChangeEvent): void { + const nextSection = this.getSectionForNavID(navChangeEvent.nextId) + if (!nextSection) { + return + } + this.router.navigate(['attributes', nextSection]) + } + + private getDefaultNavID(): DocumentAttributesNavIDs | null { + return this.visibleSections[0]?.id ?? null + } + + private getNavIDForSection(section: string): DocumentAttributesNavIDs | null { + const path = section?.toLowerCase() + if (!path) return null + + const found = this.visibleSections.find((s) => s.path === path) + return found?.id ?? null + } + + private getSectionForNavID(navID: number): string | null { + const section = this.visibleSections.find((s) => s.id === navID) + return section?.path ?? null + } +} diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.spec.ts similarity index 97% rename from src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.spec.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.spec.ts index 98071cb90..35f04fd8a 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.spec.ts @@ -9,7 +9,7 @@ import { of } from 'rxjs' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' import { CorrespondentService } from 'src/app/services/rest/correspondent.service' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' +import { PageHeaderComponent } from '../../../../common/page-header/page-header.component' import { CorrespondentListComponent } from './correspondent-list.component' describe('CorrespondentListComponent', () => { diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts similarity index 77% rename from src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts index 4a3a82b9c..8f12aaf7a 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgTemplateOutlet, TitleCasePipe } from '@angular/common' +import { NgClass, NgTemplateOutlet } from '@angular/common' import { Component, inject } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { RouterModule } from '@angular/router' @@ -7,6 +7,7 @@ import { NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { CorrespondentEditDialogComponent } from 'src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component' import { Correspondent } from 'src/app/data/correspondent' import { FILTER_HAS_CORRESPONDENT_ANY } from 'src/app/data/filter-rule-type' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -14,21 +15,16 @@ import { SortableDirective } from 'src/app/directives/sortable.directive' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' import { PermissionType } from 'src/app/services/permissions.service' import { CorrespondentService } from 'src/app/services/rest/correspondent.service' -import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component' -import { CorrespondentEditDialogComponent } from '../../common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { ManagementListComponent } from '../management-list/management-list.component' +import { ManagementListComponent } from '../management-list.component' @Component({ selector: 'pngx-correspondent-list', - templateUrl: './../management-list/management-list.component.html', - styleUrls: ['./../management-list/management-list.component.scss'], + templateUrl: './../management-list.component.html', + styleUrls: ['./../management-list.component.scss'], providers: [{ provide: CustomDatePipe }], imports: [ SortableDirective, IfPermissionsDirective, - PageHeaderComponent, - TitleCasePipe, FormsModule, ReactiveFormsModule, RouterModule, @@ -37,11 +33,10 @@ import { ManagementListComponent } from '../management-list/management-list.comp NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, - ClearableBadgeComponent, ], }) export class CorrespondentListComponent extends ManagementListComponent { - private datePipe = inject(CustomDatePipe) + private readonly datePipe = inject(CustomDatePipe) constructor() { super() diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.spec.ts similarity index 96% rename from src-ui/src/app/components/manage/document-type-list/document-type-list.component.spec.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.spec.ts index 640d6aab8..c8931cdc2 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.spec.ts @@ -9,7 +9,7 @@ import { of } from 'rxjs' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' import { DocumentTypeService } from 'src/app/services/rest/document-type.service' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' +import { PageHeaderComponent } from '../../../../common/page-header/page-header.component' import { DocumentTypeListComponent } from './document-type-list.component' describe('DocumentTypeListComponent', () => { diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts similarity index 70% rename from src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts index dc3a020be..cafe038d2 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgTemplateOutlet, TitleCasePipe } from '@angular/common' +import { NgClass, NgTemplateOutlet } from '@angular/common' import { Component, inject } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { RouterModule } from '@angular/router' @@ -7,25 +7,21 @@ import { NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { DocumentTypeEditDialogComponent } from 'src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component' import { DocumentType } from 'src/app/data/document-type' import { FILTER_HAS_DOCUMENT_TYPE_ANY } from 'src/app/data/filter-rule-type' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' import { PermissionType } from 'src/app/services/permissions.service' import { DocumentTypeService } from 'src/app/services/rest/document-type.service' -import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component' -import { DocumentTypeEditDialogComponent } from '../../common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { ManagementListComponent } from '../management-list/management-list.component' +import { ManagementListComponent } from '../management-list.component' @Component({ selector: 'pngx-document-type-list', - templateUrl: './../management-list/management-list.component.html', - styleUrls: ['./../management-list/management-list.component.scss'], + templateUrl: './../management-list.component.html', + styleUrls: ['./../management-list.component.scss'], imports: [ SortableDirective, - PageHeaderComponent, - TitleCasePipe, IfPermissionsDirective, FormsModule, ReactiveFormsModule, @@ -35,7 +31,6 @@ import { ManagementListComponent } from '../management-list/management-list.comp NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, - ClearableBadgeComponent, ], }) export class DocumentTypeListComponent extends ManagementListComponent { diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.html b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.html similarity index 64% rename from src-ui/src/app/components/manage/management-list/management-list.component.html rename to src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.html index cb2f1010f..fcec43bb8 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.html +++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.html @@ -1,50 +1,3 @@ - - -
      - -
      - - - -
      -
      - -
      -
      - Select: -
      -
      - @if (selectedObjects.size > 0) { - - } - - -
      -
      - - - - -       -
      @@ -76,19 +29,19 @@ - - - - + + + @for (column of extraColumns; track column) { - + } - + @@ -131,16 +84,16 @@ - - - + + @for (column of extraColumns; track column) { -
      +
      - +
      		NameMatchingDocument countNameMatchingDocument count{{column.name}}{{column.name}}ActionsActions
      + @if (depth > 0) {
      }       		{{ getMatching(object) }}{{ getDocumentCount(object) }}{{ getMatching(object) }}{{ getDocumentCount(object) }} + @if (column.badgeFn) { } - +
      diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.scss b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.scss similarity index 100% rename from src-ui/src/app/components/manage/management-list/management-list.component.scss rename to src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.scss diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts similarity index 97% rename from src-ui/src/app/components/manage/management-list/management-list.component.spec.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts index b2a494425..48b567752 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts @@ -44,12 +44,12 @@ import { BulkEditObjectOperation } from 'src/app/services/rest/abstract-name-fil import { TagService } from 'src/app/services/rest/tag.service' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' -import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' -import { EditDialogComponent } from '../../common/edit-dialog/edit-dialog.component' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { PermissionsDialogComponent } from '../../common/permissions-dialog/permissions-dialog.component' -import { TagListComponent } from '../tag-list/tag-list.component' +import { ConfirmDialogComponent } from '../../../common/confirm-dialog/confirm-dialog.component' +import { EditDialogComponent } from '../../../common/edit-dialog/edit-dialog.component' +import { PageHeaderComponent } from '../../../common/page-header/page-header.component' +import { PermissionsDialogComponent } from '../../../common/permissions-dialog/permissions-dialog.component' import { ManagementListComponent } from './management-list.component' +import { TagListComponent } from './tag-list/tag-list.component' const tags: Tag[] = [ { @@ -304,12 +304,12 @@ describe('ManagementListComponent', () => { }) it('selectPage should select current page items or clear selection', () => { - component.selectPage(true) + component.selectPage() expect(component.selectedObjects).toEqual(new Set(tags.map((t) => t.id))) expect(component.togggleAll).toBe(true) component.togggleAll = true - component.selectPage(false) + component.clearSelection() expect(component.selectedObjects.size).toBe(0) expect(component.togggleAll).toBe(false) }) diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts similarity index 91% rename from src-ui/src/app/components/manage/management-list/management-list.component.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts index 6f5e9c0dd..e53664520 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts @@ -16,6 +16,10 @@ import { takeUntil, tap, } from 'rxjs/operators' +import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component' +import { EditDialogMode } from 'src/app/components/common/edit-dialog/edit-dialog.component' +import { PermissionsDialogComponent } from 'src/app/components/common/permissions-dialog/permissions-dialog.component' +import { LoadingComponentWithPermissions } from 'src/app/components/loading-component/loading.component' import { MATCH_AUTO, MATCH_NONE, @@ -40,10 +44,6 @@ import { } from 'src/app/services/rest/abstract-name-filter-service' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' -import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' -import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component' -import { PermissionsDialogComponent } from '../../common/permissions-dialog/permissions-dialog.component' -import { LoadingComponentWithPermissions } from '../../loading-component/loading.component' export interface ManagementListColumn { key: string @@ -69,13 +69,14 @@ export abstract class ManagementListComponent implements OnInit, OnDestroy { protected service: AbstractNameFilterService - private modalService: NgbModal = inject(NgbModal) + private readonly modalService: NgbModal = inject(NgbModal) protected editDialogComponent: any - private toastService: ToastService = inject(ToastService) - private documentListViewService: DocumentListViewService = inject( + private readonly toastService: ToastService = inject(ToastService) + private readonly documentListViewService: DocumentListViewService = inject( DocumentListViewService ) - private permissionsService: PermissionsService = inject(PermissionsService) + private readonly permissionsService: PermissionsService = + inject(PermissionsService) protected filterRuleType: number public typeName: string public typeNamePlural: string @@ -196,7 +197,7 @@ export abstract class ManagementListComponent } openCreateDialog() { - var activeModal = this.modalService.open(this.editDialogComponent, { + const activeModal = this.modalService.open(this.editDialogComponent, { backdrop: 'static', }) activeModal.componentInstance.dialogMode = EditDialogMode.CREATE @@ -215,7 +216,7 @@ export abstract class ManagementListComponent } openEditDialog(object: T) { - var activeModal = this.modalService.open(this.editDialogComponent, { + const activeModal = this.modalService.open(this.editDialogComponent, { backdrop: 'static', }) activeModal.componentInstance.object = object @@ -243,7 +244,7 @@ export abstract class ManagementListComponent } openDeleteDialog(object: T) { - var activeModal = this.modalService.open(ConfirmDialogComponent, { + const activeModal = this.modalService.open(ConfirmDialogComponent, { backdrop: 'static', }) activeModal.componentInstance.title = $localize`Confirm delete` @@ -343,13 +344,9 @@ export abstract class ManagementListComponent this.clearSelection() } - selectPage(select: boolean) { - if (select) { - this.selectedObjects = new Set(this.getSelectableIDs(this.data)) - this.togggleAll = this.areAllPageItemsSelected() - } else { - this.clearSelection() - } + selectPage() { + this.selectedObjects = new Set(this.getSelectableIDs(this.data)) + this.togggleAll = this.areAllPageItemsSelected() } selectAll() { diff --git a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.spec.ts similarity index 96% rename from src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.spec.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.spec.ts index e59c52789..d2b75ca56 100644 --- a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.spec.ts @@ -10,7 +10,7 @@ import { StoragePath } from 'src/app/data/storage-path' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' import { StoragePathService } from 'src/app/services/rest/storage-path.service' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' +import { PageHeaderComponent } from '../../../../common/page-header/page-header.component' import { StoragePathListComponent } from './storage-path-list.component' describe('StoragePathListComponent', () => { diff --git a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts similarity index 73% rename from src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts index 3ab940521..14129544e 100644 --- a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgTemplateOutlet, TitleCasePipe } from '@angular/common' +import { NgClass, NgTemplateOutlet } from '@angular/common' import { Component, inject } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { RouterModule } from '@angular/router' @@ -7,25 +7,21 @@ import { NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { StoragePathEditDialogComponent } from 'src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component' import { FILTER_HAS_STORAGE_PATH_ANY } from 'src/app/data/filter-rule-type' import { StoragePath } from 'src/app/data/storage-path' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' import { PermissionType } from 'src/app/services/permissions.service' import { StoragePathService } from 'src/app/services/rest/storage-path.service' -import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component' -import { StoragePathEditDialogComponent } from '../../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { ManagementListComponent } from '../management-list/management-list.component' +import { ManagementListComponent } from '../management-list.component' @Component({ selector: 'pngx-storage-path-list', - templateUrl: './../management-list/management-list.component.html', - styleUrls: ['./../management-list/management-list.component.scss'], + templateUrl: './../management-list.component.html', + styleUrls: ['./../management-list.component.scss'], imports: [ SortableDirective, - PageHeaderComponent, - TitleCasePipe, IfPermissionsDirective, FormsModule, ReactiveFormsModule, @@ -35,7 +31,6 @@ import { ManagementListComponent } from '../management-list/management-list.comp NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, - ClearableBadgeComponent, ], }) export class StoragePathListComponent extends ManagementListComponent { diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts similarity index 96% rename from src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts index a69eacba0..526da6c9e 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts @@ -9,7 +9,7 @@ import { of } from 'rxjs' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' import { TagService } from 'src/app/services/rest/tag.service' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' +import { PageHeaderComponent } from '../../../../common/page-header/page-header.component' import { TagListComponent } from './tag-list.component' describe('TagListComponent', () => { @@ -138,12 +138,12 @@ describe('TagListComponent', () => { } component.data = [parent as any] - component.selectPage(true) + component.selectPage() expect(component.selectedObjects.has(10)).toBe(true) expect(component.selectedObjects.has(11)).toBe(true) - component.selectPage(false) + component.clearSelection() expect(component.selectedObjects.size).toBe(0) }) }) diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts similarity index 79% rename from src-ui/src/app/components/manage/tag-list/tag-list.component.ts rename to src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts index 87045a50a..f221fd572 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts @@ -1,4 +1,4 @@ -import { NgClass, NgTemplateOutlet, TitleCasePipe } from '@angular/common' +import { NgClass, NgTemplateOutlet } from '@angular/common' import { Component, inject } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { RouterModule } from '@angular/router' @@ -7,25 +7,21 @@ import { NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { TagEditDialogComponent } from 'src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component' import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type' import { Tag } from 'src/app/data/tag' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' import { PermissionType } from 'src/app/services/permissions.service' import { TagService } from 'src/app/services/rest/tag.service' -import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component' -import { TagEditDialogComponent } from '../../common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { ManagementListComponent } from '../management-list/management-list.component' +import { ManagementListComponent } from '../management-list.component' @Component({ selector: 'pngx-tag-list', - templateUrl: './../management-list/management-list.component.html', - styleUrls: ['./../management-list/management-list.component.scss'], + templateUrl: './../management-list.component.html', + styleUrls: ['./../management-list.component.scss'], imports: [ SortableDirective, - PageHeaderComponent, - TitleCasePipe, IfPermissionsDirective, FormsModule, ReactiveFormsModule, @@ -35,7 +31,6 @@ import { ManagementListComponent } from '../management-list/management-list.comp NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, - ClearableBadgeComponent, ], }) export class TagListComponent extends ManagementListComponent { diff --git a/src-ui/src/app/data/ui-settings.ts b/src-ui/src/app/data/ui-settings.ts index 9b72cb1d6..c47c409d5 100644 --- a/src-ui/src/app/data/ui-settings.ts +++ b/src-ui/src/app/data/ui-settings.ts @@ -19,6 +19,10 @@ export enum GlobalSearchType { TITLE_CONTENT = 'title-content', } +export enum CollapsibleSection { + ATTRIBUTES = 'attributes', +} + export const PAPERLESS_GREEN_HEX = '#17541f' export const SETTINGS_KEYS = { @@ -51,6 +55,8 @@ export const SETTINGS_KEYS = { NOTES_ENABLED: 'general-settings:notes-enabled', AUDITLOG_ENABLED: 'general-settings:auditlog-enabled', SLIM_SIDEBAR: 'general-settings:slim-sidebar', + ATTRIBUTES_SECTIONS_COLLAPSED: + 'general-settings:attributes-sections-collapsed', UPDATE_CHECKING_ENABLED: 'general-settings:update-checking:enabled', UPDATE_CHECKING_BACKEND_SETTING: 'general-settings:update-checking:backend-setting', @@ -112,6 +118,11 @@ export const SETTINGS: UiSetting[] = [ type: 'boolean', default: false, }, + { + key: SETTINGS_KEYS.ATTRIBUTES_SECTIONS_COLLAPSED, + type: 'array', + default: [], + }, { key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: 'number', diff --git a/src-ui/src/app/guards/permissions.guard.spec.ts b/src-ui/src/app/guards/permissions.guard.spec.ts index c10232f2b..69191e1ad 100644 --- a/src-ui/src/app/guards/permissions.guard.spec.ts +++ b/src-ui/src/app/guards/permissions.guard.spec.ts @@ -96,4 +96,52 @@ describe('PermissionsGuard', () => { expect(canActivate).toHaveProperty('root') // returns UrlTree expect(toastSpy).toHaveBeenCalled() }) + + it('should activate when any required permission is granted', () => { + jest + .spyOn(permissionsService, 'currentUserCan') + .mockImplementation((action, type) => { + return type === PermissionType.Tag + }) + + const canActivate = guard.canActivate( + { + data: { + requiredPermissionAny: [ + { action: PermissionAction.View, type: PermissionType.Tag }, + { + action: PermissionAction.View, + type: PermissionType.DocumentType, + }, + ], + }, + } as any, + routerState.snapshot + ) + + expect(canActivate).toBeTruthy() + }) + + it('should not activate when no required permission is granted', () => { + jest + .spyOn(permissionsService, 'currentUserCan') + .mockImplementation(() => false) + + const canActivate = guard.canActivate( + { + data: { + requiredPermissionAny: [ + { action: PermissionAction.View, type: PermissionType.Tag }, + { + action: PermissionAction.View, + type: PermissionType.DocumentType, + }, + ], + }, + } as any, + routerState.snapshot + ) + + expect(canActivate).toHaveProperty('root') + }) }) diff --git a/src-ui/src/app/guards/permissions.guard.ts b/src-ui/src/app/guards/permissions.guard.ts index ddac8e035..01d5e63cb 100644 --- a/src-ui/src/app/guards/permissions.guard.ts +++ b/src-ui/src/app/guards/permissions.guard.ts @@ -20,12 +20,20 @@ export class PermissionsGuard { route: ActivatedRouteSnapshot, state: RouterStateSnapshot ): boolean | UrlTree { + const requiredPermissionAny: { action: any; type: any }[] = + route.data.requiredPermissionAny + if ( (route.data.requireAdmin && !this.permissionsService.isAdmin()) || (route.data.requiredPermission && !this.permissionsService.currentUserCan( route.data.requiredPermission.action, route.data.requiredPermission.type + )) || + (Array.isArray(requiredPermissionAny) && + requiredPermissionAny.length > 0 && + !requiredPermissionAny.some((p) => + this.permissionsService.currentUserCan(p.action, p.type) )) ) { // Check if tour is running 1 = TourState.ON diff --git a/src-ui/src/main.ts b/src-ui/src/main.ts index cccfc96db..675e9961c 100644 --- a/src-ui/src/main.ts +++ b/src-ui/src/main.ts @@ -125,6 +125,7 @@ import { sliders2Vertical, sortAlphaDown, sortAlphaUpAlt, + stack, stars, tag, tagFill, @@ -343,6 +344,7 @@ const icons = { sliders2Vertical, sortAlphaDown, sortAlphaUpAlt, + stack, stars, tagFill, tag, From 6622349b5f5d242af8d4845dfdc1701782de9e39 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Feb 2026 17:37:56 +0000 Subject: [PATCH 4/4] Auto translate strings --- src-ui/messages.xlf | 1483 +++++++++++------------- src/locale/en_US/LC_MESSAGES/django.po | 26 +- 2 files changed, 709 insertions(+), 800 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 723d7691e..5cb79e418 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -343,24 +343,24 @@ 192 - src/app/components/manage/custom-fields/custom-fields.component.html - 70 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 58 - src/app/components/manage/management-list/management-list.component.html - 198 + src/app/components/manage/document-attributes/management-list/management-list.component.html + 151 - src/app/components/manage/management-list/management-list.component.html - 198 + src/app/components/manage/document-attributes/management-list/management-list.component.html + 151 - src/app/components/manage/management-list/management-list.component.html - 198 + src/app/components/manage/document-attributes/management-list/management-list.component.html + 151 - src/app/components/manage/management-list/management-list.component.html - 198 + src/app/components/manage/document-attributes/management-list/management-list.component.html + 151 @@ -379,11 +379,11 @@ src/app/components/app-frame/app-frame.component.html - 258 + 274 src/app/components/app-frame/app-frame.component.html - 260 + 276 @@ -421,8 +421,8 @@ 193 - - Tags, correspondents, document types and storage paths can all be managed using these pages. They can also be created from the document edit view. + + Attributes like tags, correspondents, document types, storage paths and custom fields can all be managed here. They can also be created from the document edit view. src/app/app.component.ts 198 @@ -560,7 +560,7 @@ src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 76 + 81 src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html @@ -649,11 +649,11 @@ src/app/components/app-frame/app-frame.component.html - 293 + 309 src/app/components/app-frame/app-frame.component.html - 296 + 312 @@ -763,8 +763,24 @@ 134 - src/app/components/manage/custom-fields/custom-fields.component.html - 26 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 14 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 52 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 52 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 52 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 52 src/app/components/manage/mail/mail.component.html @@ -782,22 +798,6 @@ src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html 16 - - src/app/components/manage/management-list/management-list.component.html - 99 - - - src/app/components/manage/management-list/management-list.component.html - 99 - - - src/app/components/manage/management-list/management-list.component.html - 99 - - - src/app/components/manage/management-list/management-list.component.html - 99 - src/app/components/manage/saved-views/saved-views.component.html 69 @@ -1067,11 +1067,11 @@ src/app/components/app-frame/app-frame.component.html - 218 + 234 src/app/components/app-frame/app-frame.component.html - 220 + 236 src/app/components/manage/saved-views/saved-views.component.html @@ -1297,6 +1297,10 @@ src/app/components/document-list/filter-editor/filter-editor.component.html 101 + + src/app/components/manage/document-attributes/document-attributes.component.html + 45 + src/app/components/manage/mail/mail.component.html 66 @@ -1313,22 +1317,6 @@ src/app/components/manage/mail/mail.component.html 166 - - src/app/components/manage/management-list/management-list.component.html - 38 - - - src/app/components/manage/management-list/management-list.component.html - 38 - - - src/app/components/manage/management-list/management-list.component.html - 38 - - - src/app/components/manage/management-list/management-list.component.html - 38 - Default Permissions @@ -1550,7 +1538,7 @@ src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 75 + 80 src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html @@ -1711,11 +1699,7 @@ src/app/components/app-frame/app-frame.component.html - 188 - - - src/app/components/app-frame/app-frame.component.html - 191 + 205 src/app/components/common/input/tags/tags.component.ts @@ -1737,6 +1721,10 @@ src/app/components/document-list/filter-editor/filter-editor.component.html 39 + + src/app/components/manage/document-attributes/document-attributes.component.ts + 89 + src/app/data/document.ts 42 @@ -1793,7 +1781,11 @@ src/app/components/app-frame/app-frame.component.ts - 182 + 216 + + + src/app/components/app-frame/app-frame.component.ts + 241 @@ -1804,11 +1796,11 @@ src/app/components/app-frame/app-frame.component.html - 281 + 297 src/app/components/app-frame/app-frame.component.html - 283 + 299 @@ -1896,8 +1888,40 @@ 8 - src/app/components/manage/custom-fields/custom-fields.component.html - 17 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 5 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 5 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 5 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 5 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 5 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 38 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 38 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 38 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 38 src/app/components/manage/mail/mail.component.html @@ -1907,38 +1931,6 @@ src/app/components/manage/mail/mail.component.html 111 - - src/app/components/manage/management-list/management-list.component.html - 52 - - - src/app/components/manage/management-list/management-list.component.html - 52 - - - src/app/components/manage/management-list/management-list.component.html - 52 - - - src/app/components/manage/management-list/management-list.component.html - 52 - - - src/app/components/manage/management-list/management-list.component.html - 85 - - - src/app/components/manage/management-list/management-list.component.html - 85 - - - src/app/components/manage/management-list/management-list.component.html - 85 - - - src/app/components/manage/management-list/management-list.component.html - 85 - src/app/components/manage/workflows/workflows.component.html 17 @@ -2024,8 +2016,24 @@ 87 - src/app/components/manage/custom-fields/custom-fields.component.html - 19 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 7 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 44 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 44 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 44 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 44 src/app/components/manage/mail/mail.component.html @@ -2035,22 +2043,6 @@ src/app/components/manage/mail/mail.component.html 116 - - src/app/components/manage/management-list/management-list.component.html - 91 - - - src/app/components/manage/management-list/management-list.component.html - 91 - - - src/app/components/manage/management-list/management-list.component.html - 91 - - - src/app/components/manage/management-list/management-list.component.html - 91 - src/app/components/manage/saved-views/saved-views.component.html 28 @@ -2219,11 +2211,11 @@ src/app/components/app-frame/app-frame.component.html - 241 + 257 src/app/components/app-frame/app-frame.component.html - 244 + 260 @@ -2350,12 +2342,52 @@ 167 - src/app/components/manage/custom-fields/custom-fields.component.html - 43 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 31 - src/app/components/manage/custom-fields/custom-fields.component.html - 61 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 49 + + + src/app/components/manage/document-attributes/document-attributes.component.html + 49 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 121 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 121 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 121 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 121 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 140 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 140 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 140 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 140 + + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 254 src/app/components/manage/mail/mail.component.html @@ -2373,58 +2405,6 @@ src/app/components/manage/mail/mail.component.html 169 - - src/app/components/manage/management-list/management-list.component.html - 41 - - - src/app/components/manage/management-list/management-list.component.html - 41 - - - src/app/components/manage/management-list/management-list.component.html - 41 - - - src/app/components/manage/management-list/management-list.component.html - 41 - - - src/app/components/manage/management-list/management-list.component.html - 168 - - - src/app/components/manage/management-list/management-list.component.html - 168 - - - src/app/components/manage/management-list/management-list.component.html - 168 - - - src/app/components/manage/management-list/management-list.component.html - 168 - - - src/app/components/manage/management-list/management-list.component.html - 187 - - - src/app/components/manage/management-list/management-list.component.html - 187 - - - src/app/components/manage/management-list/management-list.component.html - 187 - - - src/app/components/manage/management-list/management-list.component.html - 187 - - - src/app/components/manage/management-list/management-list.component.ts - 253 - src/app/components/manage/saved-views/saved-views.component.html 30 @@ -2456,12 +2436,12 @@ 110 - src/app/components/manage/management-list/management-list.component.ts - 249 + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 250 - src/app/components/manage/management-list/management-list.component.ts - 414 + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 411 @@ -2490,8 +2470,12 @@ 198 - src/app/components/manage/custom-fields/custom-fields.component.ts - 106 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts + 104 + + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 413 src/app/components/manage/mail/mail.component.ts @@ -2501,10 +2485,6 @@ src/app/components/manage/mail/mail.component.ts 302 - - src/app/components/manage/management-list/management-list.component.ts - 416 - src/app/components/manage/workflows/workflows.component.ts 133 @@ -2588,11 +2568,11 @@ src/app/components/app-frame/app-frame.component.html - 272 + 288 src/app/components/app-frame/app-frame.component.html - 274 + 290 @@ -2669,12 +2649,44 @@ 53 - src/app/components/manage/custom-fields/custom-fields.component.html - 42 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 30 - src/app/components/manage/custom-fields/custom-fields.component.html - 58 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 46 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 120 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 120 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 120 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 120 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 137 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 137 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 137 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 137 src/app/components/manage/mail/mail.component.html @@ -2692,38 +2704,6 @@ src/app/components/manage/mail/mail.component.html 163 - - src/app/components/manage/management-list/management-list.component.html - 167 - - - src/app/components/manage/management-list/management-list.component.html - 167 - - - src/app/components/manage/management-list/management-list.component.html - 167 - - - src/app/components/manage/management-list/management-list.component.html - 167 - - - src/app/components/manage/management-list/management-list.component.html - 184 - - - src/app/components/manage/management-list/management-list.component.html - 184 - - - src/app/components/manage/management-list/management-list.component.html - 184 - - - src/app/components/manage/management-list/management-list.component.html - 184 - src/app/components/manage/workflows/workflows.component.html 54 @@ -2817,8 +2797,12 @@ 854 - src/app/components/manage/custom-fields/custom-fields.component.ts - 108 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts + 106 + + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 415 src/app/components/manage/mail/mail.component.ts @@ -2828,10 +2812,6 @@ src/app/components/manage/mail/mail.component.ts 304 - - src/app/components/manage/management-list/management-list.component.ts - 418 - src/app/components/manage/workflows/workflows.component.ts 135 @@ -2929,11 +2909,11 @@ src/app/components/app-frame/app-frame.component.html - 302 + 318 src/app/components/app-frame/app-frame.component.html - 305 + 321 @@ -2972,79 +2952,86 @@ 175 + + Attributes + + src/app/components/app-frame/app-frame.component.html + 182 + + + src/app/components/app-frame/app-frame.component.html + 184 + + Correspondents src/app/components/app-frame/app-frame.component.html - 181 - - - src/app/components/app-frame/app-frame.component.html - 183 + 210 src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html 107 - - - Document Types - src/app/components/app-frame/app-frame.component.html - 197 - - - src/app/components/app-frame/app-frame.component.html - 199 - - - src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 120 + src/app/components/manage/document-attributes/document-attributes.component.ts + 99 - - Storage Paths + + Document types src/app/components/app-frame/app-frame.component.html - 204 + 215 - src/app/components/app-frame/app-frame.component.html - 206 - - - src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 133 + src/app/components/manage/document-attributes/document-attributes.component.ts + 109 - - Custom Fields + + Storage paths src/app/components/app-frame/app-frame.component.html - 211 + 220 + + src/app/components/manage/document-attributes/document-attributes.component.ts + 119 + + + + Custom fields src/app/components/app-frame/app-frame.component.html - 213 + 225 - src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.html - 4 + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 61 - src/app/components/manage/custom-fields/custom-fields.component.html - 2 + src/app/components/document-list/filter-editor/filter-editor.component.html + 84 + + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 203 + + + src/app/components/manage/document-attributes/document-attributes.component.ts + 129 Workflows src/app/components/app-frame/app-frame.component.html - 227 + 243 src/app/components/app-frame/app-frame.component.html - 229 + 245 src/app/components/manage/workflows/workflows.component.html @@ -3055,92 +3042,92 @@ Mail src/app/components/app-frame/app-frame.component.html - 234 + 250 src/app/components/app-frame/app-frame.component.html - 237 + 253 Administration src/app/components/app-frame/app-frame.component.html - 252 + 268 Configuration src/app/components/app-frame/app-frame.component.html - 265 + 281 src/app/components/app-frame/app-frame.component.html - 267 + 283 GitHub src/app/components/app-frame/app-frame.component.html - 312 + 328 is available. src/app/components/app-frame/app-frame.component.html - 321,322 + 337,338 Click to view. src/app/components/app-frame/app-frame.component.html - 322 + 338 Paperless-ngx can automatically check for updates src/app/components/app-frame/app-frame.component.html - 326 + 342 How does this work? src/app/components/app-frame/app-frame.component.html - 333,335 + 349,351 Update available src/app/components/app-frame/app-frame.component.html - 346 + 362 Sidebar views updated src/app/components/app-frame/app-frame.component.ts - 270 + 329 Error updating sidebar views src/app/components/app-frame/app-frame.component.ts - 273 + 332 An error occurred while saving update checking settings. src/app/components/app-frame/app-frame.component.ts - 294 + 353 @@ -3549,6 +3536,13 @@ 75 + + Custom Fields + + src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.html + 4 + + Search fields @@ -3570,8 +3564,8 @@ 130 - src/app/components/manage/custom-fields/custom-fields.component.ts - 87 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts + 85 @@ -3581,8 +3575,8 @@ 139 - src/app/components/manage/custom-fields/custom-fields.component.ts - 96 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts + 94 @@ -3734,20 +3728,8 @@ 30 - src/app/components/manage/management-list/management-list.component.html - 32 - - - src/app/components/manage/management-list/management-list.component.html - 32 - - - src/app/components/manage/management-list/management-list.component.html - 32 - - - src/app/components/manage/management-list/management-list.component.html - 32 + src/app/components/manage/document-attributes/document-attributes.component.html + 38 @@ -4212,18 +4194,11 @@ 113 - - 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 + 19 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -4238,155 +4213,176 @@ 41 + + Order + + src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html + 24 + + + + Stop further processing + + src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html + 27 + + + + Stop processing further rules if this rule queues any document(s). + + src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html + 27 + + 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 - 27 + 32 Folder src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 29 + 34 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 - 29 + 34 Maximum age (days) src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 30 + 35 Filter from src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 33 + 38 Filter to src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 34 + 39 Filter subject src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 35 + 40 Filter body src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 36 + 41 Consumption scope src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 42 + 47 See docs for .eml processing requirements src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 42 + 47 Attachment type src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 43 + 48 PDF layout src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 44 + 49 Include only files matching src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 47 + 52 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 - 47 + 52 src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 48 + 53 Exclude files matching src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 48 + 53 Action src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 54 + 59 Only performed if the mail is processed. src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 54 + 59 Action parameter src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 56 + 61 Assign title from src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 58 + 63 Assign owner from rule src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 59 + 64 Assign document type src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 63 + 68 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -4397,14 +4393,14 @@ Assign correspondent from src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 64 + 69 Assign correspondent src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 66 + 71 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -4415,7 +4411,7 @@ Error src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html - 73 + 78 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -4615,8 +4611,8 @@ 13 - src/app/components/manage/storage-path-list/storage-path-list.component.ts - 53 + src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts + 48 @@ -4690,8 +4686,8 @@ 13 - src/app/components/manage/tag-list/tag-list.component.ts - 53 + src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts + 48 @@ -5661,20 +5657,8 @@ 65 - src/app/components/manage/management-list/management-list.component.html - 44 - - - src/app/components/manage/management-list/management-list.component.html - 44 - - - src/app/components/manage/management-list/management-list.component.html - 44 - - - src/app/components/manage/management-list/management-list.component.html - 44 + src/app/components/manage/document-attributes/document-attributes.component.html + 53 @@ -7222,6 +7206,20 @@ 43 + + Document Types + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 120 + + + + Storage Paths + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 133 + + Other @@ -7337,20 +7335,8 @@ 27 - src/app/components/manage/management-list/management-list.component.html - 29 - - - src/app/components/manage/management-list/management-list.component.html - 29 - - - src/app/components/manage/management-list/management-list.component.html - 29 - - - src/app/components/manage/management-list/management-list.component.html - 29 + src/app/components/manage/document-attributes/document-attributes.component.html + 35 @@ -7443,7 +7429,7 @@ src/main.ts - 403 + 405 @@ -7972,21 +7958,6 @@ 73 - - Custom fields - - src/app/components/document-list/bulk-editor/bulk-editor.component.html - 61 - - - src/app/components/document-list/filter-editor/filter-editor.component.html - 84 - - - src/app/components/document-list/filter-editor/filter-editor.component.ts - 203 - - Filter custom fields @@ -8488,20 +8459,8 @@ 5 - src/app/components/manage/management-list/management-list.component.html - 6 - - - src/app/components/manage/management-list/management-list.component.html - 6 - - - src/app/components/manage/management-list/management-list.component.html - 6 - - - src/app/components/manage/management-list/management-list.component.html - 6 + src/app/components/manage/document-attributes/document-attributes.component.html + 12 src/app/data/custom-field.ts @@ -8515,20 +8474,8 @@ 11 - src/app/components/manage/management-list/management-list.component.html - 12 - - - src/app/components/manage/management-list/management-list.component.html - 12 - - - src/app/components/manage/management-list/management-list.component.html - 12 - - - src/app/components/manage/management-list/management-list.component.html - 12 + src/app/components/manage/document-attributes/document-attributes.component.html + 18 @@ -8542,20 +8489,8 @@ 315 - src/app/components/manage/management-list/management-list.component.html - 13 - - - src/app/components/manage/management-list/management-list.component.html - 13 - - - src/app/components/manage/management-list/management-list.component.html - 13 - - - src/app/components/manage/management-list/management-list.component.html - 13 + src/app/components/manage/document-attributes/document-attributes.component.html + 19 @@ -8569,20 +8504,8 @@ 308 - src/app/components/manage/management-list/management-list.component.html - 14 - - - src/app/components/manage/management-list/management-list.component.html - 14 - - - src/app/components/manage/management-list/management-list.component.html - 14 - - - src/app/components/manage/management-list/management-list.component.html - 14 + src/app/components/manage/document-attributes/document-attributes.component.html + 20 @@ -8592,20 +8515,8 @@ 18 - src/app/components/manage/management-list/management-list.component.html - 20 - - - src/app/components/manage/management-list/management-list.component.html - 20 - - - src/app/components/manage/management-list/management-list.component.html - 20 - - - src/app/components/manage/management-list/management-list.component.html - 20 + src/app/components/manage/document-attributes/document-attributes.component.html + 26 @@ -8615,24 +8526,12 @@ 23 - src/app/components/manage/management-list/management-list.component.html - 25 + src/app/components/manage/document-attributes/document-attributes.component.html + 31 - src/app/components/manage/management-list/management-list.component.html - 25 - - - src/app/components/manage/management-list/management-list.component.html - 25 - - - src/app/components/manage/management-list/management-list.component.html - 25 - - - src/app/components/manage/management-list/management-list.component.ts - 129 + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 130 src/app/data/matching-model.ts @@ -9194,132 +9093,387 @@ 142 - - correspondent - - src/app/components/manage/correspondent-list/correspondent-list.component.ts - 51 - - - - correspondents - - src/app/components/manage/correspondent-list/correspondent-list.component.ts - 52 - - - - Last used - - src/app/components/manage/correspondent-list/correspondent-list.component.ts - 57 - - - - Do you really want to delete the correspondent ""? - - src/app/components/manage/correspondent-list/correspondent-list.component.ts - 82 - - - - Customize the data fields that can be attached to documents. - - src/app/components/manage/custom-fields/custom-fields.component.html - 4 - - - - Add Field - - src/app/components/manage/custom-fields/custom-fields.component.html - 9 - - Data Type - src/app/components/manage/custom-fields/custom-fields.component.html - 18 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 6 Filter Documents () - src/app/components/manage/custom-fields/custom-fields.component.html - 50 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 38 - src/app/components/manage/management-list/management-list.component.html - 176 + src/app/components/manage/document-attributes/management-list/management-list.component.html + 129 - src/app/components/manage/management-list/management-list.component.html - 176 + src/app/components/manage/document-attributes/management-list/management-list.component.html + 129 - src/app/components/manage/management-list/management-list.component.html - 176 + src/app/components/manage/document-attributes/management-list/management-list.component.html + 129 - src/app/components/manage/management-list/management-list.component.html - 176 + src/app/components/manage/document-attributes/management-list/management-list.component.html + 129 No fields defined. - src/app/components/manage/custom-fields/custom-fields.component.html - 80 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html + 68 Confirm delete field - src/app/components/manage/custom-fields/custom-fields.component.ts - 104 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts + 102 This operation will permanently delete this field. - src/app/components/manage/custom-fields/custom-fields.component.ts - 105 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts + 103 Deleted field "" - src/app/components/manage/custom-fields/custom-fields.component.ts - 114 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts + 112 Error deleting field "". - src/app/components/manage/custom-fields/custom-fields.component.ts - 123 + src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts + 121 + + + + Manage tags, correspondents, document types, storage paths, and custom fields. + + src/app/components/manage/document-attributes/document-attributes.component.html + 3 + + + + Add Field + + src/app/components/manage/document-attributes/document-attributes.component.html + 58 + + + + correspondent + + src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts + 46 + + + + correspondents + + src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts + 47 + + + + Last used + + src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts + 52 + + + + Do you really want to delete the correspondent ""? + + src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts + 77 document type - src/app/components/manage/document-type-list/document-type-list.component.ts - 47 + src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts + 42 document types - src/app/components/manage/document-type-list/document-type-list.component.ts - 48 + src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts + 43 Do you really want to delete the document type ""? - src/app/components/manage/document-type-list/document-type-list.component.ts - 53 + src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts + 48 + + + + Filter by: + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 4 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 4 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 4 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 4 + + + + Show: + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 12 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 12 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 12 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 12 + + + + per page + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 20 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 20 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 20 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 20 + + + + Matching + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 39 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 39 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 39 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 39 + + + + Document count + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 40 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 40 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 40 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 40 + + + + {VAR_PLURAL, plural, =1 {One } other { total }} + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 67 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 67 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 67 + + + src/app/components/manage/document-attributes/management-list/management-list.component.html + 67 + + + + Automatic + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 128 + + + src/app/data/matching-model.ts + 15 + + + + Successfully created . + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 207 + + + + Error occurred while creating . + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 212 + + + + Successfully updated "". + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 227 + + + + Error occurred while saving . + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 232 + + + + Associated documents will not be deleted. + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 252 + + + + Error while deleting element + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 268 + + + + Error saving settings + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 307 + + + + Permissions updated successfully + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 391 + + + + Error updating permissions + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 398 + + + src/app/components/manage/mail/mail.component.ts + 351 + + + + This operation will permanently delete the selected . + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 412 + + + + Objects deleted successfully + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 426 + + + + Error deleting objects + + src/app/components/manage/document-attributes/management-list/management-list.component.ts + 432 + + + + storage path + + src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts + 42 + + + + storage paths + + src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts + 43 + + + + Do you really want to delete the storage path ""? + + src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts + 59 + + + + tag + + src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts + 42 + + + + tags + + src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts + 43 + + + + Do you really want to delete the tag ""? + + src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts + 59 @@ -9582,17 +9736,6 @@ 346 - - Error updating permissions - - src/app/components/manage/mail/mail.component.ts - 351 - - - src/app/components/manage/management-list/management-list.component.ts - 401 - - Processed Mail for @@ -9628,208 +9771,6 @@ 72 - - Filter by: - - src/app/components/manage/management-list/management-list.component.html - 51 - - - src/app/components/manage/management-list/management-list.component.html - 51 - - - src/app/components/manage/management-list/management-list.component.html - 51 - - - src/app/components/manage/management-list/management-list.component.html - 51 - - - - Show: - - src/app/components/manage/management-list/management-list.component.html - 59 - - - src/app/components/manage/management-list/management-list.component.html - 59 - - - src/app/components/manage/management-list/management-list.component.html - 59 - - - src/app/components/manage/management-list/management-list.component.html - 59 - - - - per page - - src/app/components/manage/management-list/management-list.component.html - 67 - - - src/app/components/manage/management-list/management-list.component.html - 67 - - - src/app/components/manage/management-list/management-list.component.html - 67 - - - src/app/components/manage/management-list/management-list.component.html - 67 - - - - Matching - - src/app/components/manage/management-list/management-list.component.html - 86 - - - src/app/components/manage/management-list/management-list.component.html - 86 - - - src/app/components/manage/management-list/management-list.component.html - 86 - - - src/app/components/manage/management-list/management-list.component.html - 86 - - - - Document count - - src/app/components/manage/management-list/management-list.component.html - 87 - - - src/app/components/manage/management-list/management-list.component.html - 87 - - - src/app/components/manage/management-list/management-list.component.html - 87 - - - src/app/components/manage/management-list/management-list.component.html - 87 - - - - {VAR_PLURAL, plural, =1 {One } other { total }} - - src/app/components/manage/management-list/management-list.component.html - 114 - - - src/app/components/manage/management-list/management-list.component.html - 114 - - - src/app/components/manage/management-list/management-list.component.html - 114 - - - src/app/components/manage/management-list/management-list.component.html - 114 - - - - Automatic - - src/app/components/manage/management-list/management-list.component.ts - 127 - - - src/app/data/matching-model.ts - 15 - - - - Successfully created . - - src/app/components/manage/management-list/management-list.component.ts - 206 - - - - Error occurred while creating . - - src/app/components/manage/management-list/management-list.component.ts - 211 - - - - Successfully updated "". - - src/app/components/manage/management-list/management-list.component.ts - 226 - - - - Error occurred while saving . - - src/app/components/manage/management-list/management-list.component.ts - 231 - - - - Associated documents will not be deleted. - - src/app/components/manage/management-list/management-list.component.ts - 251 - - - - Error while deleting element - - src/app/components/manage/management-list/management-list.component.ts - 267 - - - - Error saving settings - - src/app/components/manage/management-list/management-list.component.ts - 306 - - - - Permissions updated successfully - - src/app/components/manage/management-list/management-list.component.ts - 394 - - - - This operation will permanently delete the selected . - - src/app/components/manage/management-list/management-list.component.ts - 415 - - - - Objects deleted successfully - - src/app/components/manage/management-list/management-list.component.ts - 429 - - - - Error deleting objects - - src/app/components/manage/management-list/management-list.component.ts - 435 - - Customize the views of your documents. @@ -9907,48 +9848,6 @@ 163 - - storage path - - src/app/components/manage/storage-path-list/storage-path-list.component.ts - 47 - - - - storage paths - - src/app/components/manage/storage-path-list/storage-path-list.component.ts - 48 - - - - Do you really want to delete the storage path ""? - - src/app/components/manage/storage-path-list/storage-path-list.component.ts - 64 - - - - tag - - src/app/components/manage/tag-list/tag-list.component.ts - 47 - - - - tags - - src/app/components/manage/tag-list/tag-list.component.ts - 48 - - - - Do you really want to delete the tag ""? - - src/app/components/manage/tag-list/tag-list.component.ts - 64 - - Use workflows to customize the behavior of Paperless-ngx when events 'trigger' a workflow. @@ -10677,7 +10576,7 @@ You don't have permissions to do that src/app/guards/permissions.guard.ts - 34 + 42 @@ -11234,14 +11133,14 @@ Prev src/main.ts - 402 + 404 End src/main.ts - 404 + 406 diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 1641f1ef2..769262028 100644 --- a/src/locale/en_US/LC_MESSAGES/django.po +++ b/src/locale/en_US/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-03 20:10+0000\n" +"POT-Creation-Date: 2026-02-13 17:37+0000\n" "PO-Revision-Date: 2022-02-17 04:17\n" "Last-Translator: \n" "Language-Team: English\n" @@ -2220,7 +2220,7 @@ msgstr "" msgid "account" msgstr "" -#: paperless_mail/models.py:157 paperless_mail/models.py:318 +#: paperless_mail/models.py:157 paperless_mail/models.py:326 msgid "folder" msgstr "" @@ -2312,26 +2312,36 @@ msgstr "" msgid "Assign the rule owner to documents" msgstr "" -#: paperless_mail/models.py:326 -msgid "uid" +#: paperless_mail/models.py:305 +msgid "Stop processing further rules" +msgstr "" + +#: paperless_mail/models.py:308 +msgid "" +"If True, no further rules will be processed after this one if any document " +"is queued." msgstr "" #: paperless_mail/models.py:334 -msgid "subject" +msgid "uid" msgstr "" #: paperless_mail/models.py:342 +msgid "subject" +msgstr "" + +#: paperless_mail/models.py:350 msgid "received" msgstr "" -#: paperless_mail/models.py:349 +#: paperless_mail/models.py:357 msgid "processed" msgstr "" -#: paperless_mail/models.py:355 +#: paperless_mail/models.py:363 msgid "status" msgstr "" -#: paperless_mail/models.py:363 +#: paperless_mail/models.py:371 msgid "error" msgstr ""