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/messages.xlf b/src-ui/messages.xlf index bf56823d4..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 @@ -1209,7 +1209,7 @@ src/app/components/document-detail/document-detail.component.ts - 1481 + 1496 @@ -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 @@ -2798,11 +2778,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 @@ -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 @@ -3393,7 +3380,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 +3485,7 @@ src/app/components/document-detail/document-detail.component.ts - 1533 + 1548 @@ -3509,7 +3496,7 @@ src/app/components/document-detail/document-detail.component.ts - 1534 + 1549 @@ -3520,7 +3507,7 @@ src/app/components/document-detail/document-detail.component.ts - 1535 + 1550 @@ -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 @@ -7656,56 +7642,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 +7702,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 +7773,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 +7784,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 +7802,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 @@ -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-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