From 74b850423f4dca8ea2ffc44b05035e0a0294f425 Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Thu, 9 May 2024 13:21:55 -0700 Subject: [PATCH 1/8] Resets version to -dev string --- src-ui/src/environments/environment.prod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index be887f5db..0e7999be2 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -5,7 +5,7 @@ export const environment = { apiBaseUrl: document.baseURI + 'api/', apiVersion: '5', appTitle: 'Paperless-ngx', - version: '2.8.3', + version: '2.8.3-dev', webSocketHost: window.location.host, webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:', webSocketBaseUrl: base_url.pathname + 'ws/', From 6fa35226181f9d178cc8b3ed3b010ecfda309642 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 10 May 2024 09:00:37 -0700 Subject: [PATCH 2/8] Fix: only count inbox documents from inbox tags with permissions (#6670) --- src/documents/tests/test_api_documents.py | 39 +++++++++++++++++++++++ src/documents/views.py | 4 ++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.py index 65e10539a..7e69cb024 100644 --- a/src/documents/tests/test_api_documents.py +++ b/src/documents/tests/test_api_documents.py @@ -930,6 +930,45 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): self.assertEqual(response.data["documents_inbox"], None) self.assertEqual(response.data["inbox_tag"], None) + def test_statistics_multiple_users(self): + """ + GIVEN: + - Inbox tags with different owners and documents that are accessible to different users + WHEN: + - Statistics are requested + THEN: + - Statistics only include inbox counts for tags accessible by the user + """ + u1 = User.objects.create_user("user1") + u2 = User.objects.create_user("user2") + inbox_tag_u1 = Tag.objects.create(name="inbox_u1", is_inbox_tag=True, owner=u1) + Tag.objects.create(name="inbox_u2", is_inbox_tag=True, owner=u2) + doc_u1 = Document.objects.create( + title="none1", + checksum="A", + mime_type="application/pdf", + owner=u1, + ) + doc2_u1 = Document.objects.create( + title="none2", + checksum="B", + mime_type="application/pdf", + ) + doc_u1.tags.add(inbox_tag_u1) + doc2_u1.save() + doc2_u1.tags.add(inbox_tag_u1) + doc2_u1.save() + + self.client.force_authenticate(user=u1) + response = self.client.get("/api/statistics/") + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data["documents_inbox"], 2) + + self.client.force_authenticate(user=u2) + response = self.client.get("/api/statistics/") + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data["documents_inbox"], 0) + def test_upload(self): self.consume_file_mock.return_value = celery.result.AsyncResult( id=str(uuid.uuid4()), diff --git a/src/documents/views.py b/src/documents/views.py index 806585e4a..6005b1938 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -1391,7 +1391,9 @@ class StatisticsView(APIView): inbox_tag = tags.filter(is_inbox_tag=True) documents_inbox = ( - documents.filter(tags__is_inbox_tag=True).distinct().count() + documents.filter(tags__is_inbox_tag=True, tags__id__in=tags) + .distinct() + .count() if inbox_tag.exists() else None ) From 52350f8b519230266aed59a0ca3e78ff7b1e8afd Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 13 May 2024 01:58:04 +0200 Subject: [PATCH 3/8] Enhancement: display current ASN in statistics (#6692) --- src-ui/messages.xlf | 17 +++++++--- .../statistics-widget.component.html | 6 ++++ .../statistics-widget.component.spec.ts | 34 +++++++++++++++++++ .../statistics-widget.component.ts | 1 + src/documents/views.py | 7 ++++ 5 files changed, 60 insertions(+), 5 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 3432faa57..4be198d69 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -2471,7 +2471,7 @@ src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 66 + 72 @@ -2490,7 +2490,7 @@ src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 58 + 64 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -2521,7 +2521,7 @@ src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 74 + 80 @@ -2536,7 +2536,7 @@ src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 82 + 88 @@ -5196,11 +5196,18 @@ 15 + + Current ASN + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 20 + + Other src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts - 65 + 66 diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html index 49ebc5ae5..18f28ddfc 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html @@ -15,6 +15,12 @@ Total characters: {{statistics?.character_count | number}} + @if (statistics?.current_asn) { +
+ Current ASN: + {{statistics?.current_asn | number}} +
+ } @if (statistics?.document_file_type_counts?.length > 1) {
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts index 43ab4d248..7d14af6ad 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts @@ -189,4 +189,38 @@ describe('StatisticsWidgetComponent', () => { 'Other(0.9%)' ) }) + + it('should display the current ASN', () => { + const mockStats = { + current_asn: 122, + } + + const req = httpTestingController.expectOne( + `${environment.apiBaseUrl}statistics/` + ) + + req.flush(mockStats) + fixture.detectChanges() + + expect(fixture.nativeElement.textContent.replace(/\s/g, '')).toContain( + 'CurrentASN:122' + ) + }) + + it('should not display the current ASN if it is not available', () => { + const mockStats = { + current_asn: 0, + } + + const req = httpTestingController.expectOne( + `${environment.apiBaseUrl}statistics/` + ) + + req.flush(mockStats) + fixture.detectChanges() + + expect(fixture.nativeElement.textContent.replace(/\s/g, '')).not.toContain( + 'CurrentASN:' + ) + }) }) diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts index 01799e9ac..e52a9b69c 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts @@ -18,6 +18,7 @@ export interface Statistics { correspondent_count?: number document_type_count?: number storage_path_count?: number + current_asn?: number } interface DocumentFileType { diff --git a/src/documents/views.py b/src/documents/views.py index 6005b1938..89a4a9011 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -1414,6 +1414,12 @@ class StatisticsView(APIView): .get("characters__sum") ) + current_asn = Document.objects.aggregate( + Max("archive_serial_number", default=0), + ).get( + "archive_serial_number__max", + ) + return Response( { "documents_total": documents_total, @@ -1425,6 +1431,7 @@ class StatisticsView(APIView): "correspondent_count": correspondent_count, "document_type_count": document_type_count, "storage_path_count": storage_path_count, + "current_asn": current_asn, }, ) From 68ca27c27cb6bef2c5ef8eee5a75dbe6b73da628 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 12 May 2024 18:43:05 -0700 Subject: [PATCH 4/8] Fix: history timestamp tooltip illegible in dark mode (#6696) --- .../components/document-history/document-history.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/document-history/document-history.component.html b/src-ui/src/app/components/document-history/document-history.component.html index 837ac0e69..8ada7880d 100644 --- a/src-ui/src/app/components/document-history/document-history.component.html +++ b/src-ui/src/app/components/document-history/document-history.component.html @@ -15,7 +15,7 @@
  • -
    +
    {{ entry.timestamp | customDate:'longDate' }} {{ entry.timestamp | date:'shortTime' }}
    From ac666df4ceea92a12fa648e885094a3a1b65a730 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 12 May 2024 19:57:08 -0700 Subject: [PATCH 5/8] Fix: only use pointer for sortable table headings, fix title width --- .../document-list.component.html | 20 +++++++++---------- .../document-list.component.scss | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index 3030909c4..b0a5b92e6 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -161,7 +161,7 @@ @if (activeDisplayFields.includes(DisplayField.ASN)) { - ASN } @if (activeDisplayFields.includes(DisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { - Correspondent } @if (activeDisplayFields.includes(DisplayField.TITLE)) { - Tags } @if (activeDisplayFields.includes(DisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { - Owner } @if (activeDisplayFields.includes(DisplayField.NOTES) && notesEnabled) { - Notes } @if (activeDisplayFields.includes(DisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { - Document type } @if (activeDisplayFields.includes(DisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { - Storage path } @if (activeDisplayFields.includes(DisplayField.CREATED)) { - Created } @if (activeDisplayFields.includes(DisplayField.ADDED)) { - } @if (activeDisplayFields.includes(DisplayField.TITLE) || activeDisplayFields.includes(DisplayField.TAGS)) { - + @if (activeDisplayFields.includes(DisplayField.TITLE)) { {{d.title | documentTitle}} } diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss index 4959d52ef..fb7db4b01 100644 --- a/src-ui/src/app/components/document-list/document-list.component.scss +++ b/src-ui/src/app/components/document-list/document-list.component.scss @@ -6,7 +6,7 @@ tr { user-select: none; } -th { +.cursor-pointer { cursor: pointer; } From 79834874306a18785210a364ae3ba089611b79db Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 13 May 2024 08:44:35 -0700 Subject: [PATCH 6/8] Security: Correctly disable eval in pdfjs (#6702) --- .../app/components/common/pdf-viewer/pdf-viewer.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts b/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts index 4fc55429a..0c84521c6 100644 --- a/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts +++ b/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts @@ -35,7 +35,6 @@ import type { import { PDFSinglePageViewer } from 'pdfjs-dist/web/pdf_viewer' PDFJS['verbosity'] = PDFJS.VerbosityLevel.ERRORS -PDFJS['isEvalSupported'] = false export enum RenderTextMode { DISABLED, @@ -440,6 +439,7 @@ export class PdfViewerComponent cMapPacked: true, enableXfa: true, } + params.isEvalSupported = false if (srcType === 'string') { params.url = this.src From a1e4365ff2df1d679c9f3cab3bb9c407643b7d39 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 13 May 2024 09:12:02 -0700 Subject: [PATCH 7/8] Enhancement: global search tweaks (#6674) --- src-ui/messages.xlf | 50 ++++++------ .../global-search.component.html | 16 ++-- .../global-search.component.spec.ts | 76 ++++++++++++++----- .../global-search/global-search.component.ts | 67 ++++++++-------- src-ui/src/styles.scss | 3 +- 5 files changed, 130 insertions(+), 82 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 4be198d69..f3e43d396 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -1013,7 +1013,7 @@ src/app/components/app-frame/global-search/global-search.component.ts - 92 + 93 @@ -2113,11 +2113,11 @@ src/app/components/app-frame/global-search/global-search.component.html - 51 + 55 src/app/components/app-frame/global-search/global-search.component.html - 68 + 72 src/app/components/common/input/permissions/permissions-form/permissions-form.component.html @@ -2676,7 +2676,7 @@ Advanced search src/app/components/app-frame/global-search/global-search.component.html - 19 + 23 src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -2687,25 +2687,25 @@ Open src/app/components/app-frame/global-search/global-search.component.html - 45 + 49 src/app/components/app-frame/global-search/global-search.component.html - 48 + 52 Filter documents src/app/components/app-frame/global-search/global-search.component.html - 54 + 58 Download src/app/components/app-frame/global-search/global-search.component.html - 65 + 69 src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -2732,113 +2732,113 @@ No results src/app/components/app-frame/global-search/global-search.component.html - 79 + 83 Documents src/app/components/app-frame/global-search/global-search.component.html - 82 + 86 Saved Views src/app/components/app-frame/global-search/global-search.component.html - 88 + 92 Tags src/app/components/app-frame/global-search/global-search.component.html - 95 + 99 Correspondents src/app/components/app-frame/global-search/global-search.component.html - 102 + 106 Document types src/app/components/app-frame/global-search/global-search.component.html - 109 + 113 Storage paths src/app/components/app-frame/global-search/global-search.component.html - 116 + 120 Users src/app/components/app-frame/global-search/global-search.component.html - 123 + 127 Groups src/app/components/app-frame/global-search/global-search.component.html - 130 + 134 Custom fields src/app/components/app-frame/global-search/global-search.component.html - 137 + 141 Mail accounts src/app/components/app-frame/global-search/global-search.component.html - 144 + 148 Mail rules src/app/components/app-frame/global-search/global-search.component.html - 151 + 155 Workflows src/app/components/app-frame/global-search/global-search.component.html - 158 + 162 Successfully updated object. src/app/components/app-frame/global-search/global-search.component.ts - 168 + 175 src/app/components/app-frame/global-search/global-search.component.ts - 206 + 213 Error occurred saving object. src/app/components/app-frame/global-search/global-search.component.ts - 171 + 178 src/app/components/app-frame/global-search/global-search.component.ts - 209 + 216 diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.html b/src-ui/src/app/components/app-frame/global-search/global-search.component.html index 317303de7..eeb118967 100644 --- a/src-ui/src/app/components/app-frame/global-search/global-search.component.html +++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.html @@ -6,15 +6,19 @@
    + autocomplete="off" + spellcheck="false" + [(ngModel)]="query" + (ngModelChange)="this.queryDebounce.next($event)" + (keydown)="searchInputKeyDown($event)" + ngbDropdownAnchor>
    @if (loading) { }
    - @if (query && (searchResults?.documents.length === searchService.searchResultObjectLimit || searchService.searchDbOnly)) { + @if (query) { @if (type !== DataType.SavedView && type !== DataType.Workflow && type !== DataType.CustomField && type !== DataType.Group && type !== DataType.User && type !== DataType.MailAccount && type !== DataType.MailRule) {