From 3b2bc292d80708332f32c903af9a01104ff8a34e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Mon, 14 Dec 2020 23:14:04 -0800 Subject: [PATCH 01/92] Tweak checkbox --- .../document-card-small.component.html | 2 +- .../document-card-small.component.scss | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 4ced42bdd..378047602 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -3,7 +3,7 @@
-
+
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss index 36db2203c..a4af1bb11 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss @@ -8,7 +8,15 @@ } .document-card-check { - display: none + display: none; + position: absolute; + top: 0; + left: 0; + + .custom-control { + margin-left: 4px; + margin-right: -3px; + } } .document-card:hover .document-card-check { @@ -17,8 +25,12 @@ .card-selected { border-color: $primary; + + .document-card-check { + display: block; + } } .doc-img-background-selected { background-color: $primaryFaded; -} \ No newline at end of file +} From b45bd665736879afcc776d876a5eacad35000b66 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Mon, 14 Dec 2020 23:14:19 -0800 Subject: [PATCH 02/92] Basic bulk editor component --- src-ui/src/app/app.module.ts | 2 + .../bulk-editor/bulk-editor.component.html | 16 +++++++ .../bulk-editor/bulk-editor.component.scss | 0 .../bulk-editor/bulk-editor.component.spec.ts | 25 ++++++++++ .../bulk-editor/bulk-editor.component.ts | 46 +++++++++++++++++++ .../document-list.component.html | 30 +++++++----- .../document-list/document-list.component.ts | 4 ++ 7 files changed, 111 insertions(+), 12 deletions(-) create mode 100644 src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html create mode 100644 src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss create mode 100644 src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts create mode 100644 src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 914854892..627d4f6cf 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -32,6 +32,7 @@ import { FilterDropdownButtonComponent } from './components/filter-editor/filter import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown-date/filter-dropdown-date.component'; import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component'; import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component'; +import { BulkEditorComponent } from './components/document-list/bulk-editor/bulk-editor.component'; import { NgxFileDropModule } from 'ngx-file-drop'; import { TextComponent } from './components/common/input/text/text.component'; import { SelectComponent } from './components/common/input/select/select.component'; @@ -84,6 +85,7 @@ import { SelectDialogComponent } from './components/common/select-dialog/select- FilterDropdownDateComponent, DocumentCardLargeComponent, DocumentCardSmallComponent, + BulkEditorComponent, TextComponent, SelectComponent, CheckComponent, diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html new file mode 100644 index 000000000..a1574f6f7 --- /dev/null +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -0,0 +1,16 @@ +
+ + + +
+
+ + + + + + +
+
+ +
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts new file mode 100644 index 000000000..140d73301 --- /dev/null +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BulkEditorComponent } from './bulk-editor.component'; + +describe('BulkEditorComponent', () => { + let component: BulkEditorComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ BulkEditorComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(BulkEditorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts new file mode 100644 index 000000000..7459d62dc --- /dev/null +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -0,0 +1,46 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { DocumentListViewService } from 'src/app/services/document-list-view.service'; + +@Component({ + selector: 'app-bulk-editor', + templateUrl: './bulk-editor.component.html', + styleUrls: ['./bulk-editor.component.scss'] +}) +export class BulkEditorComponent { + + @Input() + list: DocumentListViewService + + @Output() + selectPage = new EventEmitter() + + @Output() + selectAll = new EventEmitter() + + @Output() + selectNone = new EventEmitter() + + @Output() + setCorrespondent = new EventEmitter() + + @Output() + removeCorresponden = new EventEmitter() + + @Output() + setDocumentType = new EventEmitter() + + @Output() + removeDocumentType = new EventEmitter() + + @Output() + addTag = new EventEmitter() + + @Output() + removeTag = new EventEmitter() + + @Output() + delete = new EventEmitter() + + constructor( ) { } + +} 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 be2ed4847..36e9ff8fd 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 @@ -1,25 +1,16 @@
- -
+
-
- - - - - - -
-
@@ -96,6 +87,21 @@ [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination">
+
+ + +
+
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 1bd1e5c7f..0a6fa4352 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -52,6 +52,10 @@ export class DocumentListComponent implements OnInit { return DOCUMENT_SORT_FIELDS } + get isBulkEditing(): boolean { + return this.list.selected.size > 0 + } + saveDisplayMode() { localStorage.setItem('document-list:displayMode', this.displayMode) } From 34c42c4339a9ef8b7f5d03d76be1eddb6a84d865 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Mon, 14 Dec 2020 23:39:10 -0800 Subject: [PATCH 03/92] Better svgs --- .../filter-dropdown-button.component.html | 4 ++-- .../app/components/filter-editor/filter-editor.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html index 8dff12a33..0ea870533 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html @@ -1,7 +1,7 @@ From 03f071fd27c2e7e003655d534a8affe28d48b871 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 15 Dec 2020 00:57:31 -0800 Subject: [PATCH 04/92] Styled, organized button UI --- .../bulk-editor/bulk-editor.component.html | 101 +++++++++++++++--- .../bulk-editor/bulk-editor.component.scss | 6 ++ .../bulk-editor/bulk-editor.component.ts | 2 +- .../document-list.component.html | 2 +- 4 files changed, 95 insertions(+), 16 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index a1574f6f7..54212923a 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1,16 +1,89 @@ -
- - - +
+
+
+ +
+ + + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
-
- - - - - - -
-
-
+ + + + + + Add + + + + + + + Edit + + + + + + + Remove + diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss index e69de29bb..3868e7a02 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss @@ -0,0 +1,6 @@ +.btn svg { + width: 0.9em; + height: 0.9em; + margin-right: 2px; + margin-top: -1px; +} diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 7459d62dc..5c1ad01ae 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -24,7 +24,7 @@ export class BulkEditorComponent { setCorrespondent = new EventEmitter() @Output() - removeCorresponden = new EventEmitter() + removeCorrespondent = new EventEmitter() @Output() setDocumentType = new EventEmitter() 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 36e9ff8fd..a88ad65b7 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 @@ -87,7 +87,7 @@ [rotate]="true" (pageChange)="list.reload()" aria-label="Default pagination">
-
+
Date: Tue, 15 Dec 2020 11:09:25 -0800 Subject: [PATCH 05/92] Smaller editor, cleaned up responsive flow --- .../bulk-editor/bulk-editor.component.html | 54 +++++++++---------- .../bulk-editor/bulk-editor.component.scss | 6 ++- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 54212923a..22724db17 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1,67 +1,67 @@
-
-
- +
+
+
- - -
-
- +
+
- -
-
- +
+
- -
-
- +
+
- -
-
-
@@ -71,19 +71,19 @@ - Add + Add - Edit + Edit - Remove + Remove diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss index 3868e7a02..5afd86545 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss @@ -1,6 +1,10 @@ .btn svg { width: 0.9em; height: 0.9em; - margin-right: 2px; + margin-right: 3px; margin-top: -1px; } + +.btn-sm { + line-height: 1; +} From fb9d750684092f40b4d5f5cee565d12ecd15f2f5 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 15 Dec 2020 14:19:40 -0800 Subject: [PATCH 06/92] Delete button margin-left --- .../document-list/bulk-editor/bulk-editor.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 22724db17..d330ba228 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -56,7 +56,7 @@
-
+
{{hint}} -
\ No newline at end of file +
diff --git a/src-ui/src/app/components/common/input/select/select.component.scss b/src-ui/src/app/components/common/input/select/select.component.scss index e69de29bb..8faec3bc0 100644 --- a/src-ui/src/app/components/common/input/select/select.component.scss +++ b/src-ui/src/app/components/common/input/select/select.component.scss @@ -0,0 +1 @@ +// styles for ng-select child are in styles.scss diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html index 8029dd860..8a5dbc4f2 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.html +++ b/src-ui/src/app/components/common/input/tags/tags.component.html @@ -1,30 +1,41 @@ -
- +
+ -
-
- -
+
+ -
- -
- -
-
+ + + + + + + + + +
+
+ + + +
+ +
+ +
-
-
{{hint}} -
\ No newline at end of file +
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.scss b/src-ui/src/app/components/common/input/tags/tags.component.scss index f2635b7f2..2eaaa4f6d 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.scss +++ b/src-ui/src/app/components/common/input/tags/tags.component.scss @@ -1,10 +1,12 @@ -.tags-form-control { - height: auto; +.selected-icon { + min-width: 1em; + min-height: 1em; } +.tag-wrap { + font-size: 1rem; +} -.scrollable-menu { - height: auto; - max-height: 300px; - overflow-x: hidden; -} \ No newline at end of file +.tag-wrap-delete { + cursor: pointer; +} diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts index cca99cc55..5501ac5a6 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.ts +++ b/src-ui/src/app/components/common/input/tags/tags.component.ts @@ -21,7 +21,7 @@ export class TagsComponent implements OnInit, ControlValueAccessor { onChange = (newValue: number[]) => {}; - + onTouched = () => {}; writeValue(newValue: number[]): void { @@ -66,29 +66,28 @@ export class TagsComponent implements OnInit, ControlValueAccessor { removeTag(id) { let index = this.displayValue.indexOf(id) if (index > -1) { - this.displayValue.splice(index, 1) + let oldValue = this.displayValue + oldValue.splice(index, 1) + this.displayValue = [...oldValue] this.onChange(this.displayValue) } } - addTag(id) { - let index = this.displayValue.indexOf(id) - if (index == -1) { - this.displayValue.push(id) - this.onChange(this.displayValue) - } - } - - createTag() { var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'}) modal.componentInstance.dialogMode = 'create' modal.componentInstance.success.subscribe(newTag => { this.tagService.listAll().subscribe(tags => { this.tags = tags.results - this.addTag(newTag.id) + this.displayValue = [...this.displayValue, newTag.id] + this.onChange(this.displayValue) }) }) } + ngSelectChange() { + this.value = this.displayValue + this.onChange(this.displayValue) + } + } diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index 194497d39..f50708af3 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -13,7 +13,7 @@ {{doc.created | date}} - {{doc.title}} + {{doc.title | documentTitle}} diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index c0114f709..a3bc7e1e6 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -52,9 +52,9 @@
+ (createNew)="createCorrespondent()"> + (createNew)="createDocumentType()"> @@ -110,8 +110,8 @@ - - + + diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 5fe9f9250..b4005b920 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -6,6 +6,7 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocument } from 'src/app/data/paperless-document'; import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; +import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe'; import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { OpenDocumentsService } from 'src/app/services/open-documents.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; @@ -54,7 +55,8 @@ export class DocumentDetailComponent implements OnInit { private router: Router, private modalService: NgbModal, private openDocumentService: OpenDocumentsService, - private documentListViewService: DocumentListViewService) { } + private documentListViewService: DocumentListViewService, + private documentTitlePipe: DocumentTitlePipe) { } getContentType() { return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type @@ -90,7 +92,7 @@ export class DocumentDetailComponent implements OnInit { this.documentsService.getMetadata(doc.id).subscribe(result => { this.metadata = result }) - this.title = doc.title + this.title = this.documentTitlePipe.transform(doc.title) this.documentForm.patchValue(doc) } diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss index d6be8837e..11fb10562 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss @@ -1,5 +1,6 @@ .result-content { color: darkgray; + overflow-wrap: anywhere; } .doc-img { diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 378047602..948d585f4 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -31,7 +31,7 @@
-
+
@@ -51,7 +51,7 @@
- {{document.created | date}} + {{document.created | date}}
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 a88ad65b7..5b4511866 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 @@ -77,7 +77,7 @@ -
+
@@ -135,7 +135,7 @@ {{d.title | documentTitle}} - + @@ -154,5 +154,5 @@
- +
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 b9553930b..d7c08abec 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 @@ -2,4 +2,26 @@ .table-row-selected { background-color: $primaryFaded; -} \ No newline at end of file +} + +$paperless-card-breakpoints: ( + 0: 2, // xs + 768px: 3, //md + 992px: 4, //lg + 1200px: 5, //xl + 1400px: 6, // xxl + 1600px: 7, + 1800px: 8, + 2000px: 9 +); + +.row-cols-paperless-cards { + @each $width, $n_cols in $paperless-card-breakpoints { + @media(min-width: $width) { + > * { + flex: 0 0 auto; + width: 100% / $n_cols; + } + } + } +} diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 0a6fa4352..a8bdf89d3 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -98,6 +98,7 @@ export class DocumentListComponent implements OnInit { saveViewConfigAs() { let modal = this.modalService.open(SaveViewConfigDialogComponent, {backdrop: 'static'}) + modal.componentInstance.defaultName = this.filterEditor.generateFilterName() modal.componentInstance.saveClicked.subscribe(formValue => { let savedView = { name: formValue.name, diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts index 284be49f6..8f0eb26f2 100644 --- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts +++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -14,6 +14,19 @@ export class SaveViewConfigDialogComponent implements OnInit { @Output() public saveClicked = new EventEmitter() + _defaultName = "" + + get defaultName() { + return this._defaultName + } + + @Input() + set defaultName(value: string) { + this._defaultName = value + this.saveViewConfigForm.patchValue({name: value}) + } + + saveViewConfigForm = new FormGroup({ name: new FormControl(''), showInSideBar: new FormControl(false), diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html index 6f6a42fe2..aca6e836c 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html +++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html @@ -4,38 +4,39 @@
- -
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts index 806027f9c..e570862cd 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts +++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts @@ -1,25 +1,37 @@ -import { Component, EventEmitter, Input, Output, ElementRef, ViewChild, SimpleChange } from '@angular/core'; -import { NgbDate, NgbDateStruct, NgbDatepicker } from '@ng-bootstrap/ng-bootstrap'; - +import { formatDate } from '@angular/common'; +import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core'; +import { Subject, Subscription } from 'rxjs'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; export interface DateSelection { - before?: NgbDateStruct - after?: NgbDateStruct + before?: string + after?: string } +const FILTER_LAST_7_DAYS = 0 +const FILTER_LAST_MONTH = 1 +const FILTER_LAST_3_MONTHS = 2 +const FILTER_LAST_YEAR = 3 @Component({ selector: 'app-filter-dropdown-date', templateUrl: './filter-dropdown-date.component.html', styleUrls: ['./filter-dropdown-date.component.scss'] }) -export class FilterDropdownDateComponent { +export class FilterDropdownDateComponent implements OnInit, OnDestroy { + + quickFilters = [ + {id: FILTER_LAST_7_DAYS, name: "Last 7 days"}, + {id: FILTER_LAST_MONTH, name: "Last month"}, + {id: FILTER_LAST_3_MONTHS, name: "Last 3 months"}, + {id: FILTER_LAST_YEAR, name: "Last year"} + ] @Input() - dateBefore: NgbDateStruct + dateBefore: string @Input() - dateAfter: NgbDateStruct + dateAfter: string @Input() title: string @@ -27,83 +39,65 @@ export class FilterDropdownDateComponent { @Output() datesSet = new EventEmitter() - @ViewChild('dpAfter') dpAfter: NgbDatepicker - @ViewChild('dpBefore') dpBefore: NgbDatepicker + private datesSetDebounce$ = new Subject() - _dateBefore: NgbDateStruct - _dateAfter: NgbDateStruct - - get _maxDate(): NgbDate { - let date = new Date() - return NgbDate.from({year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()}) + private sub: Subscription + + ngOnInit() { + this.sub = this.datesSetDebounce$.pipe( + debounceTime(400) + ).subscribe(() => { + this.onChange() + }) } - isStringRange(range: any) { - return typeof range == 'string' - } - - ngOnChanges(changes: SimpleChange) { - // this is a hacky workaround perhaps because of https://github.com/angular/angular/issues/11097 - let dateString: string = '' - let dateAfterChange: SimpleChange - let dateBeforeChange: SimpleChange - if (changes) { - dateAfterChange = changes['dateAfter'] - dateBeforeChange = changes['dateBefore'] + ngOnDestroy() { + if (this.sub) { + this.sub.unsubscribe() } + } - if (this.dpBefore && this.dpAfter) { - let dpAfterElRef: ElementRef = this.dpAfter['_elRef'] - let dpBeforeElRef: ElementRef = this.dpBefore['_elRef'] + setDateQuickFilter(qf: number) { + this.dateBefore = null + let date = new Date() + switch (qf) { + case FILTER_LAST_7_DAYS: + date.setDate(date.getDate() - 7) + break; - if (dateAfterChange && dateAfterChange.currentValue) { - let dateAfterDate = dateAfterChange.currentValue as NgbDateStruct - dateString = `${dateAfterDate.year}-${dateAfterDate.month.toString().padStart(2,'0')}-${dateAfterDate.day.toString().padStart(2,'0')}` - dpAfterElRef.nativeElement.value = dateString - } else if (dateBeforeChange && dateBeforeChange.currentValue) { - let dateBeforeDate = dateBeforeChange.currentValue as NgbDateStruct - dateString = `${dateBeforeDate.year}-${dateBeforeDate.month.toString().padStart(2,'0')}-${dateBeforeDate.day.toString().padStart(2,'0')}` - dpBeforeElRef.nativeElement.value = dateString - } else { - dpAfterElRef.nativeElement.value = dateString - dpBeforeElRef.nativeElement.value = dateString + case FILTER_LAST_MONTH: + date.setMonth(date.getMonth() - 1) + break; + + case FILTER_LAST_3_MONTHS: + date.setMonth(date.getMonth() - 3) + break + + case FILTER_LAST_YEAR: + date.setFullYear(date.getFullYear() - 1) + break + } - } + this.dateAfter = formatDate(date, 'yyyy-MM-dd', "en-us", "UTC") + this.onChange() } - setDateQuickFilter(range: any) { - this._dateAfter = this._dateBefore = undefined - let date = new Date() - let newDate: NgbDateStruct = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() } - switch (typeof range) { - case 'number': - date.setDate(date.getDate() - range) - newDate.year = date.getFullYear() - newDate.month = date.getMonth() + 1 - newDate.day = date.getDate() - break - - case 'string': - newDate.day = 1 - if (range == 'year') newDate.month = 1 - break - - default: - break - } - this._dateAfter = newDate - this.datesSet.emit({after: newDate, before: null}) + onChange() { + this.datesSet.emit({after: this.dateAfter, before: this.dateBefore}) } - onBeforeSelected(date: NgbDateStruct) { - this.datesSet.emit({after: this._dateAfter, before: date}) + onChangeDebounce() { + this.datesSetDebounce$.next({after: this.dateAfter, before: this.dateBefore}) } - onAfterSelected(date: NgbDateStruct) { - this.datesSet.emit({after: date, before: this._dateBefore}) + clearBefore() { + this.dateBefore = null; + this.onChange() } - clear() { - this.datesSet.emit({after: null, before: null}) + clearAfter() { + this.dateAfter = null; + this.onChange() } + } diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html index 5de9228bd..d0cbfc3c9 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html @@ -1,6 +1,16 @@
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss index d34729eee..40c93838f 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss @@ -1,3 +1,9 @@ +.badge-corner { + position: absolute; + top: -8px; + right: -8px; +} + .dropdown-menu { min-width: 250px; diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts index d675e14f1..b9d3fca6f 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts @@ -22,7 +22,7 @@ export class FilterDropdownComponent { title: string @Input() - display: string + icon: string @Output() toggle = new EventEmitter() diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html index e07edba14..6847a2902 100644 --- a/src-ui/src/app/components/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html @@ -1,22 +1,27 @@ -
-
-
Filter by:
+
+
+
+ + +
-
- -
- - - - - - - - - +
+
+
+ + + + + +
+
+
+
+ +
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts index f98b9517f..913c738a5 100644 --- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts @@ -19,6 +19,26 @@ import { DateSelection } from './filter-dropdown-date/filter-dropdown-date.compo }) export class FilterEditorComponent implements OnInit, OnDestroy { + generateFilterName() { + if (this.filterRules.length == 1) { + let rule = this.filterRules[0] + switch(this.filterRules[0].rule_type) { + + case FILTER_CORRESPONDENT: + return `Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}` + + case FILTER_DOCUMENT_TYPE: + return `Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}` + + case FILTER_HAS_TAG: + return `Tag: ${this.tags.find(t => t.id == +rule.value)?.name}` + + } + } + + return "" + } + constructor( private documentTypeService: DocumentTypeService, private tagService: TagService, @@ -159,65 +179,61 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.applyFilters() } - get dateCreatedBefore(): NgbDateStruct { + get dateCreatedBefore(): string { let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE) - return createdBeforeRule ? this.dateParser.parse(createdBeforeRule.value) : null + return createdBeforeRule ? createdBeforeRule.value : null } - get dateCreatedAfter(): NgbDateStruct { + get dateCreatedAfter(): string { let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER) - return createdAfterRule ? this.dateParser.parse(createdAfterRule.value) : null + return createdAfterRule ? createdAfterRule.value : null } - get dateAddedBefore(): NgbDateStruct { + get dateAddedBefore(): string { let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE) - return addedBeforeRule ? this.dateParser.parse(addedBeforeRule.value) : null + return addedBeforeRule ? addedBeforeRule.value : null } - get dateAddedAfter(): NgbDateStruct { + get dateAddedAfter(): string { let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER) - return addedAfterRule ? this.dateParser.parse(addedAfterRule.value) : null + return addedAfterRule ? addedAfterRule.value : null } - setDateCreatedBefore(date?: NgbDateStruct) { + setDateCreatedBefore(date?: string) { if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE) else this.clearDateFilter(FILTER_CREATED_BEFORE) } - setDateCreatedAfter(date?: NgbDateStruct) { + setDateCreatedAfter(date?: string) { if (date) this.setDateFilter(date, FILTER_CREATED_AFTER) else this.clearDateFilter(FILTER_CREATED_AFTER) } - setDateAddedBefore(date?: NgbDateStruct) { + setDateAddedBefore(date?: string) { if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE) else this.clearDateFilter(FILTER_ADDED_BEFORE) } - setDateAddedAfter(date?: NgbDateStruct) { + setDateAddedAfter(date?: string) { if (date) this.setDateFilter(date, FILTER_ADDED_AFTER) else this.clearDateFilter(FILTER_ADDED_AFTER) } - setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) { - let filterRules = this.filterRules - let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID) - let newValue = this.dateParser.format(date) + setDateFilter(date: string, dateRuleTypeID: number) { + let existingRule = this.filterRules.find(rule => rule.rule_type == dateRuleTypeID) if (existingRule) { - existingRule.value = newValue + existingRule.value = date } else { - filterRules.push({rule_type: dateRuleTypeID, value: newValue}) + this.filterRules.push({rule_type: dateRuleTypeID, value: date}) } - - this.filterRules = filterRules } clearDateFilter(dateRuleTypeID: number) { - let filterRules = this.filterRules - let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID) - filterRules.splice(filterRules.indexOf(existingRule), 1) - this.filterRules = filterRules + let ruleIndex = this.filterRules.findIndex(rule => rule.rule_type == dateRuleTypeID) + if (ruleIndex != -1) { + this.filterRules.splice(ruleIndex, 1) + } } } diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html index 27aa4d366..2efd1c58d 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html @@ -26,9 +26,26 @@ {{ correspondent.last_correspondence | date }}
- - -
+ + + +
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts index effae2826..a128340b9 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts @@ -1,6 +1,9 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; +import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { GenericListComponent } from '../generic-list/generic-list.component'; import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/correspondent-edit-dialog.component'; @@ -12,7 +15,10 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co }) export class CorrespondentListComponent extends GenericListComponent { - constructor(correspondentsService: CorrespondentService, modalService: NgbModal,) { + constructor(correspondentsService: CorrespondentService, modalService: NgbModal, + private router: Router, + private list: DocumentListViewService + ) { super(correspondentsService,modalService,CorrespondentEditDialogComponent) } @@ -20,4 +26,10 @@ export class CorrespondentListComponent extends GenericListComponent{{ document_type.document_count }}
- - + + +
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-type-list/document-type-list.component.ts index 16cdd88a9..d18a19226 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts +++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts @@ -1,6 +1,9 @@ import { Component } from '@angular/core'; +import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { FILTER_DOCUMENT_TYPE } from 'src/app/data/filter-rule-type'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; +import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { GenericListComponent } from '../generic-list/generic-list.component'; import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/document-type-edit-dialog.component'; @@ -12,7 +15,10 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc }) export class DocumentTypeListComponent extends GenericListComponent { - constructor(service: DocumentTypeService, modalService: NgbModal) { + constructor(service: DocumentTypeService, modalService: NgbModal, + private router: Router, + private list: DocumentListViewService + ) { super(service, modalService, DocumentTypeEditDialogComponent) } @@ -20,4 +26,10 @@ export class DocumentTypeListComponent extends GenericListComponent implements On activeModal.componentInstance.message = "Associated documents will not be deleted." activeModal.componentInstance.btnClass = "btn-danger" activeModal.componentInstance.btnCaption = "Delete" - activeModal.componentInstance.confirmPressed.subscribe(() => { + activeModal.componentInstance.confirmClicked.subscribe(() => { this.service.delete(object).subscribe(_ => { activeModal.close() this.reloadData() diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index 41bb21156..f839010b1 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -50,16 +50,26 @@ export class SettingsComponent implements OnInit { }) } + private saveLocalSettings() { + localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage) + this.documentListViewService.updatePageSize() + this.toastService.showToast(Toast.make("Information", "Settings saved successfully.")) + } + saveSettings() { let x = [] for (let id in this.savedViewGroup.value) { x.push(this.savedViewGroup.value[id]) } - this.savedViewService.patchMany(x).subscribe(s => { - this.toastService.showToast(Toast.make("Information", "Settings saved successfully.")) - localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage) - this.documentListViewService.updatePageSize() - }) + if (x.length > 0) { + this.savedViewService.patchMany(x).subscribe(s => { + this.saveLocalSettings() + }, error => { + this.toastService.showToast(Toast.makeError(`Error while storing settings on server: ${JSON.stringify(error.error)}`)) + }) + } else { + this.saveLocalSettings() + } } } diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html index e68b997d1..bbe2c6dd2 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html @@ -9,7 +9,7 @@ aria-label="Default pagination">
- +
@@ -28,8 +28,25 @@ diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts index 32093e0a8..e3f151550 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts @@ -1,6 +1,9 @@ import { Component } from '@angular/core'; +import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type'; import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag'; +import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { TagService } from 'src/app/services/rest/tag.service'; import { GenericListComponent } from '../generic-list/generic-list.component'; import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.component'; @@ -12,7 +15,10 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon }) export class TagListComponent extends GenericListComponent { - constructor(tagService: TagService, modalService: NgbModal) { + constructor(tagService: TagService, modalService: NgbModal, + private router: Router, + private list: DocumentListViewService + ) { super(tagService, modalService, TagEditDialogComponent) } @@ -23,4 +29,11 @@ export class TagListComponent extends GenericListComponent { getObjectName(object: PaperlessTag) { return `tag '${object.name}'` } + + filterDocuments(object: PaperlessTag) { + this.list.documentListView.filter_rules = [ + {rule_type: FILTER_HAS_TAG, value: object.id.toString()} + ] + this.router.navigate(["documents"]) + } } diff --git a/src-ui/src/app/interceptors/csrf.interceptor.ts b/src-ui/src/app/interceptors/csrf.interceptor.ts index 32f3e99dc..2c654aa36 100644 --- a/src-ui/src/app/interceptors/csrf.interceptor.ts +++ b/src-ui/src/app/interceptors/csrf.interceptor.ts @@ -7,16 +7,21 @@ import { } from '@angular/common/http'; import { Observable } from 'rxjs'; import { CookieService } from 'ngx-cookie-service'; +import { Meta } from '@angular/platform-browser'; @Injectable() export class CsrfInterceptor implements HttpInterceptor { - constructor(private cookieService: CookieService) { + constructor(private cookieService: CookieService, private meta: Meta) { } intercept(request: HttpRequest, next: HttpHandler): Observable> { - let csrfToken = this.cookieService.get('csrftoken') + let prefix = "" + if (this.meta.getTag('name=cookie_prefix')) { + prefix = this.meta.getTag('name=cookie_prefix').content + } + let csrfToken = this.cookieService.get(`${prefix?prefix:''}csrftoken`) if (csrfToken) { request = request.clone({ setHeaders: { diff --git a/src-ui/src/app/pipes/document-title.pipe.ts b/src-ui/src/app/pipes/document-title.pipe.ts index 09445f595..621562d39 100644 --- a/src-ui/src/app/pipes/document-title.pipe.ts +++ b/src-ui/src/app/pipes/document-title.pipe.ts @@ -5,7 +5,7 @@ import { Pipe, PipeTransform } from '@angular/core'; }) export class DocumentTitlePipe implements PipeTransform { - transform(value: string): unknown { + transform(value: string): string { if (value) { return value } else { diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index 05c46750d..00f84048b 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -116,14 +116,14 @@ export class DocumentListViewService { set filterRules(filterRules: FilterRule[]) { //we're going to clone the filterRules object, since we don't //want changes in the filter editor to propagate into here right away. - this.view.filter_rules = cloneFilterRules(filterRules) + this.view.filter_rules = filterRules this.reload() this.reduceSelectionToFilter() this.saveDocumentListView() } get filterRules(): FilterRule[] { - return cloneFilterRules(this.view.filter_rules) + return this.view.filter_rules } set sortField(field: string) { @@ -245,7 +245,7 @@ export class DocumentListViewService { this.documentListView = null } } - if (!this.documentListView) { + if (!this.documentListView || !this.documentListView.filter_rules || !this.documentListView.sort_reverse || !this.documentListView.sort_field) { this.documentListView = { filter_rules: [], sort_reverse: true, diff --git a/src-ui/src/assets/save-filter.png b/src-ui/src/assets/save-filter.png index dcaa41714c78a70b8568e162a0e8afac86fe8168..0f011f8127280d88db5970d30e23570765fa5cc9 100644 GIT binary patch literal 8263 zcmc&)Wl&t*vc-eDGe~d-m*7rtg1c+*K=5D_f&_PWcPF?64emZT!C`O)hsSs8)vb4{ z-uwMd)$YCO{MfZmpX%PdR_`!XWmybVQdAfi7z}y2kLqvp&fAznhI_N{D#V^|6N+fnFn<9Xosf^(n_)UICkI=HGbC%^}SsCVA}cI_T^3WfJW%bDO=jumIu{G`@Hy}S0j2Ap*5`= zLP;UJdIg3n2Y#Oj^Ir+K4*X2k7arbrW&m3!R)BS&M|s*V)?!jbmEJ?DRO3Mkk>&kTco6rU+TtkT-DomcGT-(Y%{F_))sdb$cFH zg>1Eg$D6GL@2WChzFpVpmg!Tm4A*y=|GDvhf5HDB7~sY8aEv%c#jcLBFZ*r{(m(Q) zo2qG?S_$*7k`}bF{BIZkdxPCcS)XPVEfQG(1Rk+kiDGIjayJivBzJz70zawAnujU4 zmUmGyQi!W&Rx1q76w8EqYHB~brAY{_$U=shgmblA1rab63a%L^q)kGT$O+uBZ>$Ys z;d2H+Kf7S}N%WYC)N29=D%1%lWWx92&2ijSN2rge*2aIv7wO(b`oS30xDC%(!}Z`) zxE0_ls;)kW7JTFjBN2!i0ZI_IY;J-*&379Vg#+O{!v2Ud&rXIHTBn>2+a@M;I$;x3 zkPT!o9vcq1B-^L#vW&7h&%iC>>P`51=uP+`8B`LNSi(;$P);C^Q1i+6umntf|Hzm& zQ}F)1_7*Kj-EV?16MRb&tnm*ZMaGc(s9Q-aRS#=dYEu{Bfj!PPFsSlw`b6FLsj?UJ zv%5zXxF)FsBtTBrm6u%j6pj^!ufim%YtxR1{LLG~&|o(ip!(V^V8Qil_21_586H8Z z-l5YxfRH&%Z1*v9aX&JZ@|#v7&K0}UW^P5YMJOag=FtQV7(k1!ph^f;g88fAsG3gE zq5!YM6@q#uB`H^lFHzQc#teBRt)tQ^$Ion7qKZgLz;?iuAL2zvgEZZvYt$c!$lWv< z5~d89p-Po&*VUNQV59bS9!WYG9_G3d7)}k9dzT+olpj|Zfc1^einE&&9_I;)dI2Dg zk-i&x+Eu+E;1!Ors303VGrJhG$yh>4SNjB547t%25wiT%Ms_|JI94@lT!))@UCJTD z;me^=$@2AG=+ntl8lJTskNR(oH4ve0D0z`k`B8a?<$jgor0O!WDtjHSF&qTG&YZ1t zB3syCEP~9c7&gd0hPGxcYbYv-<3|@7!QL`0OQ>hCuXPQhAj4X5T+4ecwBaz6Gbr^Y%Q;-3pYn}}SH8l}D{ z-K25vPu}rTs>)POk+N0?ewq(bQ3E!s9Ya zexUlFAdqWO?~#%|f=N^``)$3Z>{5PF|2u>(7Tn=cCVszDe1h@uiAh%@x1fQ`5b}-7 zeW@Vm5ZJ~p=(o8stl7qN=goRbxWcFcW>V6_a`xO#r1TZx#s?>ywa~x19(KypvD96L zsOD2YL03me1?!A^#NmwW+9k8LXZ4;-LSP|qJHW{N^b6R*F$=29S!1fMrXgBn1Fj3V zFpusiq_bZAuz!m7iAa50<4f1xZDC!p}=pEE=>!f~Yoayf5{sU=8GbjRW zu&d!IP`MqFZG9TFjx$77&nS#R#gV^qI2C+2v~N{tQiEhA8!Q|4ElgFUEA z<#^sEvCFWlWwpoaI$b;cF8Y*))wOuSsM(Pmfi#_%kLbyK_>&@K%ROw{ZsUASmEjdq z&TlbBk@~j&;k!S4rpLc}GHZ&eisr%FZXSV%G8++l5#v?k7~?nR;N|7%xf#vL4*5WV z%;@qq*OCgAoN8d8r0G(Kf1}WeCD7)ecK|K%syk8wo*PMhdbLtmIuSK-F&T@T-(e}& z%sZ>AXO3!bVmz#2@QBR*{nWD6tM{=^A93*(+ZS z%a3zQW)^&qN1Waj9SD6CO$dIK?`7w$w(qaYFi-B8`k#9y(0fIbczLXio4Z#QzW{V6 z{Z25Nfb>_xRnb-7 zoD@B)cwsN|hnm}~1W7ALzV=+^`1r{9)uAnla=dv$u3g|dN7Wr)xQY%h<&tJBH@@h* z^s!Ic8CqjTKm+Kj@9nA&HFbU^B$))S8mwJE{<%S|tgh~2lu*=d<4RFq{}WzBv8cyB zo??zkJT`d_cFK}vn{KL)p0B0~WseKCa{KJz-EkF`a;v?ej!sHXcjj6AQP9PQT!jIA zB4!w_;4<9M$%SdmPBgGPKVU8u=L>Q(7(8?+p_>|w%R|YjR#&Lvpvi(>r|RHhsBYy* z7dr32IpD2+xbu0h*QC1F*E(^ZH7+Zj^@NEiwIRC7?_t;p+(Ci7N{fej{vK`~2ff!P zXKdTV6Ze@0Waxd>VH_+()V(xv5c&bSzLTceFEP=PpRG|4INr6GJw%ZVr>Qok);Q2d zrdl4K5DP5Xixwcuj$jVR46bwDR=ck(a>l=W2fPaCct-oS zy9=~=P_8591QvEquj;C4_&;Bh1#^uK+HlYh(7tT^nV%h;Sn~90PHh)9-F$O$yVzLQ z)xd4G8SMw&`5N8Er`AW~?{t-Y(>LHF(2u(I_Q#=R8t2XE(=Qr|+`hn5mk%g&PcN5P z?OAJ6t&{cPN8I>?%mT2cq@0@fQn1hRdIXL~>Dk|pD(^rsy$ z)J{D5FCtB0GZHL-68-*m=vhQenwztqQFXeIwNer6`<+Ks!ngdsHJ6Xt)1#*3-~{}6(t0lz<^fV0WU z<9f*w(fEO$>+{3GVPV~`%3oD$^#yK^L>Y@bJbc(s$VAa~)gm!tzn}VUC_A9TVy1fB zk`DCUl@YOD>Dno=V_z^CYZs9YN*ZauDb#>Pt}2@cDCyI zcd}^()+#Ws3KZBns1@Lqf2ORi31vqi9cHA#rWaYxZKe8FaM?pb~gbC-C0!0z>iO&sgGEI2aXKiB#a*ZC=(5 z5j#Su$7=u%539gcIf_ogbVsEyFf5ik0>a>9G%Sd!HxZ7VOX`_;T3TJo z!&0ez9E?V^{r9hhg~iv&nA$jbw@y@hK24oCQCNlXv9XT|7!tV}x%Rn%9N@%srF<;G zUMcI}xc1i8)?O{~8|V^@$Zi;Jv5PEv#m0{@Z|oI71qW+XjNYjrQDtrgD8!PDKJX## z19mPJqF37yFq0oG#p+4{ejr)lOi0QmneX}%&8Waq^Sswp^@uDnIJ{0cuGGw(Wpl?O z{;0aCnb%)Ybws9z7^1>cAHp9An-mumc9YvCtBsWRDukWFKd13Ak+ICN_-%28@Fa&| z&$;Iqp@R!LoA-Ydol=1r=MNhN2Me2mTObz1+a-EwvVzzu?xA{dtVN_^R8i zDv4zhbVOz*?RwxD;~!t>A2I&@%|ttHb+}7Eogj7bce|Fwwl?NPiiEDr$vPZI84X;y zpvqhU`_R5q7AUS>E}j;UC-hwWsxh`9i^`h{zG@lH`i*I*9K ze*ZG$>DdvDK{@sAIpho->2DYwLw>=djn23twj{U{2DLF<>uXy4-27sepceE(ma?eu z`h=3-tko03&IDNAV#qlAQO<^$eiuw)8Y%d)gtb?e~vfMPel`A%t! z*b72C!ns+CT7s@Lmdcz2eig67{0IniHO|LvZS**+BBlXN)*g-Ac>c0D0eOU;lvhx!+DgIPwH;%R@CbHm6 zejtL+_f@38cOt*nt?lUOD0yMw{QSJbFc{QHGk4zF@DQe(goxj8{qor4u&%47cK>kf z^ka8ux?piE^8=^{)cFiuX>25FI}s7Ky>H(>0UWZFQI5-#@8k*Drd7m$uY&s41 zJP*c@Pup}Vb6KlheErJ)`))g$d|pCRgp&V ziZB^%e?Y^1F#IX1Qc?`5FuD7|Uh~mBzW{oAZ?!wp?AR0?8F`)YCH?o?Kk9keNr(}< z*twistd#$x`~peRNgw|_1NxJsBl@uPmv7CBhNVhw6fZ^$`h>=A>^{!og=b}DEeai? zi3IXTfZME&b6&5%D?1T$6>i?|XCtDGg|KR)$t93?vuWY4hz=c|AU%hDYqhnhR*6=L zE7DZ@p^HT!%wJxb$}U8GkeCbr2z%B3A$!oMB0i4O_SQYpWejH-#*6<=6C$q4NUx1R zJ@p?f@?X628m}(j9u3&LKcT)?EWYu*oj2d9v1#GMJjMj{0is=dCQ?86oeaZ!&&h>G z^4-ILrsz9mA$i8=O6`oslhrb1pORD>$$>kLu8@4)amT&TbGd{8+ReXxdDN14hejkW zvoNyFeP7PTlt;@-nN-45-oL4chi(hJ3%`~tNdZ`VGO82qD zBtI0^SX70WNK}jgua>@|k83DaWV~T`)*t#FK195wzA66Ff#-v9vJe0P12gq0Q1+TL z^6|w5rOFnjGJ$1bA$3R>c~E8`opro$ZDu_kH${oU+SftYmd9X>OB; zHc2b_A~6b?3j%>mNu)Mg1~-n%VX)Tq&Y+53*pu3i*pHBZ_qZJjatMkUWl$;dKN5}MERf=AEvFk4B} z$#`0jWDZ{aZ)y~YSjZFO-e}o<|8I&MK|63}nX6YiRhUo;yDw-!*4$WR$$|V)Q6WMG zJtjK3UKgwo4Inq*0Sd1UL0Lq6JK9&&_}%2ZT43|52o;swuG21ENm;XnsP^y5X4lpx zw)#+WW5)LuT3S+PXa+SB5@u%A!7GmK&=)SNZ7)WTzsV5pVik*ImV@C5moBJeMNyUW zkf}G2fZzA}qq@4Jj6N{P6S5{o#lXx=L+m% zWH=$At4g;imrF5M^*QNQvafE7@Y2%KzGc^pj1F_9YDj_EktK&ojp&djj93WR=zGvVb{0xjC#(G*%yc=~VPae$#z86j_U#)E&KAR@=Fa}U)X_zKgK1tf z$>NdHUb5lhEultqjyXavO#v3U=!|7kBx@HyfsIK--M<=X(G=dL{_4_2s4dgXjFgci z$m{ZYd3IMz&`8%qd7@=oO|Uas9cWZM!%!bC;=2YpSy1r5BVCXxLn$*i1~>!5t|S~L z7){>y)>~MA^IR)$-)G&vN+B4~4Svi7@&N||u$np!fc>3$*|ndYXjnSZI0}-nN%e}p z|5e{G;)i&qpn$U}HB-5h@Iv6-_3xiZqAX=Oo%E*24bIfp)+49)UhwX6+haA6;p1je2ModF*d5Mu zvWQytcwx@+)tMW5TZt%p&jBMc%Ktw+9ZB}6JW1s{g-xY=Ri(;pBU$(q8Z=nv1zE8PvEp#*>Dg(>l(*>I zf$Dr6BvU4YyHniEkGq_(sUa$Jknv(kz|6AHQWjS2kXr{9ACH;7RiQhVPan)WjWaz% zrtr>sTwxhjSx5`6!08T&tf{1LYYAlj+C662mHc<6P`XI#nVqb>Ur5Y7u>oNo7_M0g>e_gihU=oO7>l zb{Cd3tj@sIM%6826&+&IoCHzlHwxyRWxP3ulB1RLFDV+BsYcvXelSviKg^`z{asBH zW`Go*n6*T9xb{1IjC0%jy!|7jmpk?Ub2!^Z03l*5J*fghUz;9f_+*rMCS#Ug= z7x}JChi)KT+*$HV47yZcY5}s%MEC)kc#Q~I;@vx3=KPpi_q#`CU%5);`S1PVsu=$} zz|IuXeLLLy*0Pg;|PC5oqmi9GSmU4j5uc^67|GOodP-ol;XQ{hS z+=QXK$XrgK8|d^U4X=TZwjET;Qy5T<#Q=GXKJ{_Dsc;f`s%bg!+QOA2q|>6#a<=fY z^qTy1uWesZw1!)=dU)*Np);4rTnMbR` z){))-exm`>ZFtg|!)vJe5Csq$iR_2Z#a=EIf;i1R4wct4?Wp)&wTWNZ(%Iiip8&fp z+VEDzUEjWM#2N{I69xcQo6h{C>BnM^7qd0ZH5Im%IIdU(4jwC5KK@UTB@#=`o&+WH zvm^b7%jY7iqMVoOu;oLB-zgeu>IMaJQprp8hcn%i9H_!yG+kD|Jp)KTPoD1tkkgYU|W;05~ zgyT>>ycrqO8zhV_>J?IGiuvu(p{@hJ$&J6RL#3gMNk0HQKjBtdFwkfHTF05?A*94j zO+(F+%v&&BI(xrDjxmmr@4_f< ziWP>X*p66SMI6wB&;4FdVoW4eb5SQH^Fga(-u6R!1-+po4`c0;9dBCm8QAAJGtGKJ zJ9TW232*Rh1?1fQy|U+9tGS*uzn*(}U910egC|b)MnT}fv5-m!bMi2eDQWHHbn`$5 zzRW!&5c$>LAT9yMzlu(ME9u?dgT5m5gFYJC>nQpJ99qCR?0>Y9|J~<&1J^iPGN7}U zw_Nc6moZ*EZ!^&G@$EH2CN#UV8hqowp`?9@nQTuZG+lMN#B|bm>TS}2+Yvr!ld=A_ z|B!^(aho-;aW;F$?@74zf6WW{sYVEmq*2Nx-E2P;!U+P98Er_v|6f7+f5h)AmM>Bm W9G(85(c8@c77Ao@Y zv3L21R5)5oNGMyIn!b3!l;EBqD32!gCahaBq<{z)LyApBvR3vVrpV% z84*8+>)OSF!A7QZT9JHRIL|>%!Qfz8rr^l1?jB7B452e@7nS3QNr2Tt8W)q&o}eqzah5T%oSt`i8A7HW%NKI=<3zG_Y`rH*P+EB75ZM{ zKm}bdIsQ6p%4p9p-)lEN{aZx9W?9_4}0+krdI*D%j(1myW;g{bJi9qPkJT{|3LTPW0CoK=;q9-?z`dLKuEAV5apjJctx~d7pTu;*Q+p?ER8A$x~+H$D#{%{)_WU zd<9Q6`qe&XF;)V>|F3XshkSAFtbW0f045>X7m}tr_e~-*c)Afp{~2?Ck#qfW!-4dv(o`IQv1lmGApfC zQ&L)S8dG+ciuojzQXAhiEmx&bt~T^eEPY5EOZp+lP5!9+=OfB99}x7U{yUR0nRI_B zWq)_j{H%IWZat8P2baH+V!`nYQ(ko1<;K73zTWq*=cU|*D-L&KlJILUA&%vMCKeCW zpxW}7$#cIhCJAvOZpRKdw#x(F75>D%%b=s-(Y>KJ&}r z0LG$=(%dS*idcN*xY zmb`Il)e9?__=b*7#vs=+n!z&U(PC+w7efRoP*RckS`qiWSW%%m`t8_lDT6V&@$Uq^ zxLR|9$~0P>)HTjfryb*X8(lG0K0$91y`+Ewvv^Vee+a3<)F__@Kh5vXX9vh&RM4&& zk-KaB63(;9zP>85oTF5AomDar-rd>| zMe(65uR7ii`;=W@IlfV9Czmo)f+x1Dr?m^eEd&h3CFa zT$kIES>`%I7cuA3=6qVd7O%&@ZFksl4V|zDAZpkq*kVR;Dr{{V=6dwXg5-u;D@ehL z3z-U!l6X|u?6#!UxYvaC>P_eE_z?hV3!UCVxm15<{7umGwPq^>I4AM6e?QeXC+_Rd zs*>K2Uz-31b^fYPJT+&u&9Ntx7)B96TSz%ci|zQ>E%L}V0am$G!9)<4u|h2dXm`F8 zaed*c>5SuxE9@UKjQk`&u~@Ucg0^>)s-9$}-z%XlWb5n#UkN)EYPOwqV08_r5|=b~ z(0VpjF8`ETc%;(ufH~#=j>jw3LR&h(N48rm<2ZKP1XT(du(HkvUyx17}RtK)V~ z_mkA8@=we^e*9W!=So-D8%STy*_0A;L+%{;5!Xse!+)P`)2JL7iL>$)8~)`0s0-kEtC_&hm{5rR90lfUD3 zm9AZ_NYiBn3--(jF~x~HI5ri#e26m;5rB&pBIBBQHu|p^1zq9+yH7NeOfz%ws%Eht zwKyGggs4zJmO0jCj72_r6nEoAvO{%?p@F{c@%|C{Itgrd{iSEDGFy=a1OiQ`$Rs!b zw#2*U2IM@2hX?12^&{G@A$r~p&Q;YBr?6?RF6sc!8Dc4SdaYz-HMA`=5N-EAgyDY= zV$gjs?|d<5NJ9_@A_cVUKwcB0?RwRmOyI^Bn3_8`402U%jhkin4p@!2N`#77R`_eZ z64%6R<~0OcL%Mb=fT$g4f^WV_r+OIRV`HtH&6F&xIkXD2^z|5T#ktb})?6O<(wvQn zH5~Mn;xAs$5>Fnt+#WnkcE`vHmmy-1J7zGr_N>}R!}FwbpZ+3FXl-j?a!9@X*B$8Y2TgW^_ zT#t9{71{PXbWd*=3zfXD&+A>i3akNIu9>+94cyH>u73oM2ebJCkBP7D<^S5auOAOm z<}HQhIcV30*#t%Q5e+0v#akPm9d<4S@E1|xl96Li2Ks*S_N(s1_eHk5=j`V72yhtlwYvJHp ze}``z59*G~KkzTGbErhp?W2@@JV)N&b{ajR0Z{h|(cSxMzVOoTTy~yO4)w%NeP}eX zFd+ze*95{uo?l;YU$8aq9OXt!QlU?UJ|!-ZOe!S^s%c_0uFYCiEb>`W4GtxJ4FGz3T~?Qvi5 z6eJdezr+vOFB&frB#*jk#XnmRAoYbi`{%^)aQUe?dndG(-)$4Adb*9|X;#0T(0LeY zg2o#lY}a-}co-}-)KUR!7tzR27Q71MNjKc0%Q8>_#cP_ZznYuqRjhwkg(WSPfksDG z-52i@QyoDQ@x{xD{{cQ1$su$7&01O-b%Drga)zD8GdDIkwxYTE_fDNW5YR*WBgY-~ z(3=n!^Y@nI%L*RC{#jn|51E- zrR4%NBe);c{`K+H?aKPt7Dn||(=kEoYCdo+Z<7294r>zwP+9q%&E5y<^TT#wlNw7E z`*i@w4J(&EHuY!Dd3R?g(<9SsGo6734R&KOz5I2q$3ZzhE*+EmE(0;IW-$LP zRu03HY`l5Xr+gc7T@Uap+3XiHc1GOdJ{Dl35B*!(2o$@tF8Ab3ug68j0Sd zLDYGG5oeYx~_O`OG{RDR)WLcyqGP_%K07iL2DGFgjHqe;xZ zqxwa-?2|!Irl;-Dk-kv9ajE1VSj0)Y#%An$StV&*&%M5mYpNnABg;bRp)D z4E?vmuRV4j6qvP*tU}OMsH29r+rB^wRh;H-8DI*)Z zLz*~oaE^m!nW2@wWUl9^_s?DFZ(zd8TJQm;qe6wfo%Z+ggpKzNs{xG_pmLJGOFVvj zq6a7!F>?6oh7|KktJI1gSoRrlTRJMuK&2)9l)WihKIoRI$U zpHL_zK=lBvIMbWxz)AfUw>y__-)a@!*Vi}ewjPlX#uEgd5F8k!&Ey=#citBinC?#a zkI&Akvb`-WDdCelCmx{@PMe{|6_}Avtsc+3zlD8EP?ILFzp-Pnu(Gasxvta@C5WND zoJzkh+6|T!L{E`{Tz?y6{ygVWh**HQJgK(rNrT?ibpO3TO?1`Z{sPK7(=GC%{@}dVM&RB_py|? z$Jp4O4yzrFj?ZH02TM75xn><430i*Z>-m&Ghn?-<4g>-b9{w`ubB)d5MdRUoX=&;6 z;orMLdKn6`bwLh+mogolr~{5$OOD7q6A@1p7DLKm;A1&^FOAwiY%#HXHTg2I(K6XW zA=70y)@9mvb6}0fQlU_UYGL|k_f;`t1mTnS_SuuE48fEC1#CZYSVuohl0N-@V0Jhz zmx|YBTaa?~2^OMwRr#sjGDpyrrDyHA5n`LC>BzcW#=ejW*TR8hYV611B0gG@mfox1 z7$Y7A<%x&liwTLw#>V!GOB8Z$uYqf;(cS+0qmbuE1Oo)?ot=#iLS9ES^@1H- zVb#JSOLw@}bCAS=tG-^AVW9iYLuoFBu)}8YnCAOf8t9PCE40ocwO;r;$#*t(mgJ_U zf@5Tq?z%$@Wq;}4;J9CNIDL`mPkmky;im6fSyALj?Jc`jGMO1A88b?0Om_EBatJ93 za{T>ldfEj7vG_2vvQ|V!60P~&`ztHc#-@}HF#_0py#LAp08`pLma@e^NC5`n#+OIh zJdo?pe3~t#qH;7&6Xj0&4c#PXj|8-kJ!R z{ayze1cD(DZ(rZe`t#!-r(Kw$1_lPt23JClRE_}wPkmB=o}UX)sONoPHx|JO;ViVU zz|Y^G_9r=cIw!mJ&oghKwuD*YZ)=56>|1*!v!LG6Dujw;#v!yio{TFP9E~F48>&ni zM1-!3&4UCw{i4||jsKgS{|8O~Zv|~UJUk?g(DKKzs`e)Z?#!o}9swn@hV2@_{`ez>@} zEvn^}bpdLx{Sz|0Zexzi#oi%df`^AkQxm$mY4X1{SOWffYyJ;$#3RKh1im)fiVY-B2%&|unD1W!B*)zk!Y*xEQ~ zvqMlbq0ox2&!3<9nk%)BCT@$i)e>acBEa7az`tB{u5+{66dIK$)U;}eY?vL5uunX6a@b1x_Kq4S-2V6r_?9Ly7^kGX)fsL3>@Bs^%kW`&MXy10 zny%nXGh5KNtuq^(Qdb3?Jce=z3NDR}#UQ;f&Wjw`Um`XYlaL63*Zr!yaEM~!1oGgM zPm40J%J^!#$oUMMoy0SJpA&=UCC(YV#6Xu$nmsv&5-TwCV1csilm09$EU*(5e^zFE z9R<&5Yx9whLE2+b!z#D5m}of*lHhjTIYx3s^zTaE(9IbCCxY6k!?N6W8g>k8^7N=L zBN@l$J0zARQbYTdrmY+Qh`d^9t@fwRuM2OF`P|*zE7lg> zuC}e4#O+Tsp_P87Xu2fKZh_RN4Ebd(1AlsRhPVE(bC*|^6%DLRsE?^+)4qj%p`h4y zX_eKpw6N*ZSS_}ZDp(1ma`SLWyI;W5wY9C)%1W4U;U>o3+$3J_iiwKJrrEWoIgHi3;@GBCDc94} zHJ!&5lo-;PPq#KY%Kg#o#gh1O0W`7S)WlIS{iBkRnHzvN1l$w>`{7?6(&-O*JP>f! zm(ywM&IL3q%PSH`4VILYa40F+$$P#K(u$EE3l2fu#<|OGXZG(D!pFla)Bd>{TS*mF z)H~BRKCqBxP$bQy(3Xj6s>BeKkXg?GEFo!$9?x1X2C&T;XlNP+Zr|?DT`4SFL~i77 z$;1Z_WpxC1$7LgzzU6{19Y-c$KjRg5Fad-XI(oIV4=qO;az01V28tfro@D)+xu}aC zUH|<2>(>lyfl>@b5n5-tMn_D%)z*fnyO1O6#-ns269zsGmhM&mPOdnN=_siwz(R;WD9|(Rw!n_|M5ex>i<-b4C2(B*_mT@<6 zQahUX9?;dlqPG!AB!Hj7>V;Ljv$MNvG1p{WdmoR+*QDVHHbB|hsP29qoSf(QhhO%e z*HdYHf7;_QsaEWt{Cu5^UW5`yU*g7uM-bk5&3`1zv@*0W6^j&?2;Qg`aQmG{*zAWL z^wC}(dr+;uF5tw3GpL*0c=tjd#SiQ@Wu}_aYEpJXIPW%v3&IQ){y4ZHBB;lQ$LiapwY1&W7H8_pijqJPA~squ+O+9A!(XToH?=?q z2@&JP`Ju(JSq7zJ>sB$eVC45uvTX*=YL>7)%RK}sDQzm&s|6hFwvPwe4-P*9f%xRF z(DjjA_I>HaDCp-?5LMsRP*)PFSl9*!B=zO(-Tp%mW3n783rKEkl&9XMoPpOX>9eD? zm6evJ<{r#QMw5b^d>+cWwt{+(3tO98BA>5d(9n3xi5iLmMtHR+M}t_(6%glpOXW9V z{l*>b6+AMZS`_&`E*g@HF_xplhooDI)r60n7j=@AdV-jaD7qH95*>nwhG7XCa}5Z} zD}`9a^?9yF%Kn#VaTy8y5yy9zuVQ~9qmF=v0(2?U*MHc_yi*oTF+CNZVN`L!=*awF$P6svZAZsofAyJfO%qq=n)RpmcFKo{Z1~(=0{x{^*dmIf|)KaCv|wl zeK>CgtlxTidiv}>7t>I`X<)V=pCh35(bp%%CtYMLNtBo~)jU`AB<7v`qKoN+5UvFNtr2lQL1v>U0Z~iPzjq|b= zB549mGBGok(lEXG@Bz~+sVB6sP{Kfru2F_`J~~={tQ^%+CZg^lI)j2v#yvJ8IlH1( zBRfb^G5aHY_gIj$O0R+lCqFloVY{p)^MLmZ*38Kx?0-_w@C|3h+QUJ_E=M8kAgJE; z(&f_qq0&p&=*6!zH%Dbz&J`23SLm3C{)B(r&xgR0{ODm(u}4|9f1DE-G7ws1lX`6w z_)CPqvxN~J?}(B;6+;UCe5 zI++<-E*{=%-!s{?u^o;FsH#j{u8-pw-$H7yljq6Nz7w9Pm(KU*nb&vGER9;=pY1DA(tP>Q{99F5%X=@Ny_O+hDtdI( zJ(G`;oPq!!KV8T;c6YSD|K+3m!}iq(F|Q?&SkR)fx_)8jy3aWNF$My@*UPYo+jYMm zxQN@f5dEzC{1d}INbELh_Svebzv^tvF<{!xkx`h(cMDV3*s#2_ayCsp+g+&;G1k8VE8)9Uz{`?;U#qobz`o{_s5)u-fIn+h^U|BY!`*8?QU-yB*~N;xK76LbwLX@ z%M#PuNUw!i86xV1zM^3$OB*RKwLbb3+&jAVo$A@HQawyIzCC`PtfPL&w#|Ox`>;~_ zhHjv2mU$4_=lDNnPXBE&`#)iUs>tKwe|J;X0ruFkFY z&yDhMJDDWaXkXPpxM$_%h{Od#84Ui*;`rt{Pg<=-o~9K8Iih~?MM_DsO57;;e*we= BL(BjG diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 09154dfca..f12c6a7cb 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -1,5 +1,6 @@ export const environment = { production: true, apiBaseUrl: "/api/", - appTitle: "Paperless-ng" + appTitle: "Paperless-ng", + version: "0.9.8" }; diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index b0b66b7f9..6e09db630 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -1,7 +1,6 @@ @import "theme"; - @import "node_modules/bootstrap/scss/bootstrap"; - +@import "~@ng-select/ng-select/themes/default.theme.css"; .toolbaricon { width: 1.2em; @@ -20,7 +19,7 @@ } body { - font-size: .875rem; + font-size: 0.875rem; } .form-control-dark { @@ -65,4 +64,39 @@ body { display: block; background-size: 1rem; float: right; -} \ No newline at end of file +} + +.paperless-input-select { + .ng-select { + position: relative; + flex: 1 1 auto; + margin-bottom: 0; + min-height: calc(1.5em + 0.75rem + 5px); + line-height: 1.5; + + .ng-select-container { + height: 100%; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + + .ng-value-container .ng-input { + top: 10px; + } + } + + .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected, + .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected.ng-option-marked { + background: none; + } + } +} + +.paperless-input-tags { + .ng-select.ng-select-multiple .ng-select-container .ng-value-container .ng-value { + background-color: transparent; + } + + .ng-select.ng-select-multiple .ng-select-container .ng-value-container { + padding-top: 1px; + } +} diff --git a/src/documents/admin.py b/src/documents/admin.py index 6ec3b736e..78437f91c 100755 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -69,7 +69,7 @@ class DocumentAdmin(admin.ModelAdmin): filter_horizontal = ("tags",) - ordering = ["-created", "correspondent"] + ordering = ["-created"] date_hierarchy = "created" diff --git a/src/documents/checks.py b/src/documents/checks.py index 3e3ddb1fb..b6da5bfc9 100644 --- a/src/documents/checks.py +++ b/src/documents/checks.py @@ -2,6 +2,7 @@ import textwrap from django.conf import settings from django.core.checks import Error, register +from django.core.exceptions import FieldError from django.db.utils import OperationalError, ProgrammingError from documents.signals import document_consumer_declaration @@ -16,7 +17,7 @@ def changed_password_check(app_configs, **kwargs): try: encrypted_doc = Document.objects.filter( storage_type=Document.STORAGE_TYPE_GPG).first() - except (OperationalError, ProgrammingError): + except (OperationalError, ProgrammingError, FieldError): return [] # No documents table yet if encrypted_doc: diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py index c49493991..5643756ac 100644 --- a/src/documents/file_handling.py +++ b/src/documents/file_handling.py @@ -99,6 +99,11 @@ def generate_filename(doc, counter=0): tags = defaultdictNoStr(lambda: slugify(None), many_to_dictionary(doc.tags)) + tag_list = pathvalidate.sanitize_filename( + ",".join([tag.name for tag in doc.tags.all()]), + replacement_text="-" + ) + if doc.correspondent: correspondent = pathvalidate.sanitize_filename( doc.correspondent.name, replacement_text="-" @@ -127,7 +132,7 @@ def generate_filename(doc, counter=0): added_month=f"{doc.added.month:02}" if doc.added else "none", added_day=f"{doc.added.day:02}" if doc.added else "none", tags=tags, - tag_list=",".join([tag.name for tag in doc.tags.all()]) + tag_list=tag_list ).strip() path = path.strip(os.sep) diff --git a/src/documents/management/commands/decrypt_documents.py b/src/documents/management/commands/decrypt_documents.py index 918f1a175..8f5c2e123 100644 --- a/src/documents/management/commands/decrypt_documents.py +++ b/src/documents/management/commands/decrypt_documents.py @@ -2,7 +2,6 @@ import os from django.conf import settings from django.core.management.base import BaseCommand, CommandError -from termcolor import colored as coloured from documents.models import Document from paperless.db import GnuPG @@ -26,16 +25,14 @@ class Command(BaseCommand): def handle(self, *args, **options): try: - print(coloured( + print( "\n\nWARNING: This script is going to work directly on your " "document originals, so\nWARNING: you probably shouldn't run " "this unless you've got a recent backup\nWARNING: handy. It " "*should* work without a hitch, but be safe and backup your\n" "WARNING: stuff first.\n\nHit Ctrl+C to exit now, or Enter to " - "continue.\n\n", - "yellow", - attrs=("bold",) - )) + "continue.\n\n" + ) __ = input() except KeyboardInterrupt: return @@ -57,8 +54,8 @@ class Command(BaseCommand): for document in encrypted_files: - print(coloured("Decrypting {}".format( - document).encode('utf-8'), "green")) + print("Decrypting {}".format( + document).encode('utf-8')) old_paths = [document.source_path, document.thumbnail_path] diff --git a/src/documents/migrations/1003_mime_types.py b/src/documents/migrations/1003_mime_types.py index 1038d57b3..78ecced2b 100644 --- a/src/documents/migrations/1003_mime_types.py +++ b/src/documents/migrations/1003_mime_types.py @@ -6,13 +6,17 @@ import magic from django.conf import settings from django.db import migrations, models +from paperless.db import GnuPG + +STORAGE_TYPE_UNENCRYPTED = "unencrypted" +STORAGE_TYPE_GPG = "gpg" def source_path(self): if self.filename: fname = str(self.filename) else: fname = "{:07}.{}".format(self.pk, self.file_type) - if self.storage_type == self.STORAGE_TYPE_GPG: + if self.storage_type == STORAGE_TYPE_GPG: fname += ".gpg" return os.path.join( @@ -26,9 +30,18 @@ def add_mime_types(apps, schema_editor): documents = Document.objects.all() for d in documents: - d.mime_type = magic.from_file(source_path(d), mime=True) + f = open(source_path(d), "rb") + if d.storage_type == STORAGE_TYPE_GPG: + + data = GnuPG.decrypted(f) + else: + data = f.read(1024) + + d.mime_type = magic.from_buffer(data, mime=True) d.save() + f.close() + def add_file_extensions(apps, schema_editor): Document = apps.get_model("documents", "Document") diff --git a/src/documents/migrations/1008_auto_20201216_1736.py b/src/documents/migrations/1008_auto_20201216_1736.py new file mode 100644 index 000000000..d94f4767f --- /dev/null +++ b/src/documents/migrations/1008_auto_20201216_1736.py @@ -0,0 +1,34 @@ +# Generated by Django 3.1.4 on 2020-12-16 17:36 + +from django.db import migrations +import django.db.models.functions.text + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '1007_savedview_savedviewfilterrule'), + ] + + operations = [ + migrations.AlterModelOptions( + name='correspondent', + options={'ordering': (django.db.models.functions.text.Lower('name'),)}, + ), + migrations.AlterModelOptions( + name='document', + options={'ordering': ('-created',)}, + ), + migrations.AlterModelOptions( + name='documenttype', + options={'ordering': (django.db.models.functions.text.Lower('name'),)}, + ), + migrations.AlterModelOptions( + name='savedview', + options={'ordering': (django.db.models.functions.text.Lower('name'),)}, + ), + migrations.AlterModelOptions( + name='tag', + options={'ordering': (django.db.models.functions.text.Lower('name'),)}, + ), + ] diff --git a/src/documents/migrations/1009_auto_20201216_2005.py b/src/documents/migrations/1009_auto_20201216_2005.py new file mode 100644 index 000000000..5e8302bb0 --- /dev/null +++ b/src/documents/migrations/1009_auto_20201216_2005.py @@ -0,0 +1,29 @@ +# Generated by Django 3.1.4 on 2020-12-16 20:05 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '1008_auto_20201216_1736'), + ] + + operations = [ + migrations.AlterModelOptions( + name='correspondent', + options={'ordering': ('name',)}, + ), + migrations.AlterModelOptions( + name='documenttype', + options={'ordering': ('name',)}, + ), + migrations.AlterModelOptions( + name='savedview', + options={'ordering': ('name',)}, + ), + migrations.AlterModelOptions( + name='tag', + options={'ordering': ('name',)}, + ), + ] diff --git a/src/documents/models.py b/src/documents/models.py index 1b1f697bc..3a6d155ed 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -12,7 +12,6 @@ from django.conf import settings from django.contrib.auth.models import User from django.db import models from django.utils import timezone -from django.utils.text import slugify from documents.file_handling import archive_name_from_filename from documents.parsers import get_default_file_extension @@ -205,7 +204,7 @@ class Document(models.Model): ) class Meta: - ordering = ("correspondent", "title") + ordering = ("-created",) def __str__(self): created = datetime.date.isoformat(self.created) @@ -221,7 +220,7 @@ class Document(models.Model): else: fname = "{:07}{}".format(self.pk, self.file_type) if self.storage_type == self.STORAGE_TYPE_GPG: - fname += ".gpg" + fname += ".gpg" # pragma: no cover return os.path.join( settings.ORIGINALS_DIR, @@ -308,6 +307,10 @@ class Log(models.Model): class SavedView(models.Model): + class Meta: + + ordering = ("name",) + user = models.ForeignKey(User, on_delete=models.CASCADE) name = models.CharField(max_length=128) @@ -340,7 +343,11 @@ class SavedViewFilterRule(models.Model): (17, "Does not have tag"), ] - saved_view = models.ForeignKey(SavedView, on_delete=models.CASCADE, related_name="filter_rules") + saved_view = models.ForeignKey( + SavedView, + on_delete=models.CASCADE, + related_name="filter_rules" + ) rule_type = models.PositiveIntegerField(choices=RULE_TYPES) diff --git a/src/documents/parsers.py b/src/documents/parsers.py index 228e2c86e..cbbb912de 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -163,8 +163,6 @@ def parse_date(filename, text): date = None - next_year = timezone.now().year + 5 # Arbitrary 5 year future limit - # if filename date parsing is enabled, search there first: if settings.FILENAME_DATE_ORDER: for m in re.finditer(DATE_REGEX, filename): @@ -176,7 +174,7 @@ def parse_date(filename, text): # Skip all matches that do not parse to a proper date continue - if date is not None and next_year > date.year > 1900: + if date and date.year > 1900 and date <= timezone.now(): return date # Iterate through all regex matches in text and try to parse the date @@ -189,7 +187,7 @@ def parse_date(filename, text): # Skip all matches that do not parse to a proper date continue - if date is not None and next_year > date.year > 1900: + if date and date.year > 1900 and date <= timezone.now(): break else: date = None diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index e34279b1a..f9fde9ac8 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -187,17 +187,19 @@ class SavedViewSerializer(serializers.ModelSerializer): else: rules_data = None super(SavedViewSerializer, self).update(instance, validated_data) - if rules_data: + if rules_data is not None: SavedViewFilterRule.objects.filter(saved_view=instance).delete() for rule_data in rules_data: - SavedViewFilterRule.objects.create(saved_view=instance, **rule_data) + SavedViewFilterRule.objects.create( + saved_view=instance, **rule_data) return instance def create(self, validated_data): rules_data = validated_data.pop('filter_rules') saved_view = SavedView.objects.create(**validated_data) for rule_data in rules_data: - SavedViewFilterRule.objects.create(saved_view=saved_view, **rule_data) + SavedViewFilterRule.objects.create( + saved_view=saved_view, **rule_data) return saved_view diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html index 728f3a0e7..06dbb678e 100644 --- a/src/documents/templates/index.html +++ b/src/documents/templates/index.html @@ -8,6 +8,7 @@ PaperlessUi + diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index bd0d9a421..43da9c058 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -5,13 +5,11 @@ import tempfile from unittest import mock from django.contrib.auth.models import User -from django.test import client -from pathvalidate import ValidationError from rest_framework.test import APITestCase from whoosh.writing import AsyncWriter -from documents import index, bulk_edit -from documents.models import Document, Correspondent, DocumentType, Tag +from documents import index +from documents.models import Document, Correspondent, DocumentType, Tag, SavedView from documents.tests.utils import DirectoriesMixin @@ -20,8 +18,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): def setUp(self): super(TestDocumentApi, self).setUp() - user = User.objects.create_superuser(username="temp_admin") - self.client.force_login(user=user) + self.user = User.objects.create_superuser(username="temp_admin") + self.client.force_login(user=self.user) def testDocuments(self): @@ -172,15 +170,13 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, 200) results = response.data['results'] self.assertEqual(len(results), 2) - self.assertEqual(results[0]['id'], doc2.id) - self.assertEqual(results[1]['id'], doc3.id) + self.assertCountEqual([results[0]['id'], results[1]['id']], [doc2.id, doc3.id]) response = self.client.get("/api/documents/?tags__id__in={},{}".format(tag_inbox.id, tag_3.id)) self.assertEqual(response.status_code, 200) results = response.data['results'] self.assertEqual(len(results), 2) - self.assertEqual(results[0]['id'], doc1.id) - self.assertEqual(results[1]['id'], doc3.id) + self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc3.id]) response = self.client.get("/api/documents/?tags__id__all={},{}".format(tag_2.id, tag_3.id)) self.assertEqual(response.status_code, 200) @@ -202,8 +198,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, 200) results = response.data['results'] self.assertEqual(len(results), 2) - self.assertEqual(results[0]['id'], doc1.id) - self.assertEqual(results[1]['id'], doc2.id) + self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc2.id]) response = self.client.get("/api/documents/?tags__id__none={},{}".format(tag_3.id, tag_2.id)) self.assertEqual(response.status_code, 200) @@ -518,114 +513,86 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertGreater(len(meta['original_metadata']), 0) self.assertIsNone(meta['archive_metadata']) + def test_saved_views(self): + u1 = User.objects.create_user("user1") + u2 = User.objects.create_user("user2") -class TestBulkEdit(DirectoriesMixin, APITestCase): + v1 = SavedView.objects.create(user=u1, name="test1", sort_field="", show_on_dashboard=False, show_in_sidebar=False) + v2 = SavedView.objects.create(user=u2, name="test2", sort_field="", show_on_dashboard=False, show_in_sidebar=False) + v3 = SavedView.objects.create(user=u2, name="test3", sort_field="", show_on_dashboard=False, show_in_sidebar=False) - def setUp(self): - super(TestBulkEdit, self).setUp() - - user = User.objects.create_superuser(username="temp_admin") - self.client.force_login(user=user) - - patcher = mock.patch('documents.bulk_edit.async_task') - self.async_task = patcher.start() - self.addCleanup(patcher.stop) - self.c1 = Correspondent.objects.create(name="c1") - self.c2 = Correspondent.objects.create(name="c2") - self.dt1 = DocumentType.objects.create(name="dt1") - self.dt2 = DocumentType.objects.create(name="dt2") - self.t1 = Tag.objects.create(name="t1") - self.t2 = Tag.objects.create(name="t2") - self.doc1 = Document.objects.create(checksum="A", title="A") - self.doc2 = Document.objects.create(checksum="B", title="B", correspondent=self.c1, document_type=self.dt1) - self.doc3 = Document.objects.create(checksum="C", title="C", correspondent=self.c2, document_type=self.dt2) - self.doc4 = Document.objects.create(checksum="D", title="D") - self.doc5 = Document.objects.create(checksum="E", title="E") - self.doc2.tags.add(self.t1) - self.doc3.tags.add(self.t2) - self.doc4.tags.add(self.t1, self.t2) - - def test_set_correspondent(self): - self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1) - bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], self.c2.id) - self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 3) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id]) - - def test_unset_correspondent(self): - self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1) - bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], None) - self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 0) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id]) - - def test_set_document_type(self): - self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1) - bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], self.dt2.id) - self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 3) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id]) - - def test_unset_document_type(self): - self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1) - bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], None) - self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 0) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id]) - - def test_add_tag(self): - self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2) - bulk_edit.add_tag([self.doc1.id, self.doc2.id, self.doc3.id, self.doc4.id], self.t1.id) - self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 4) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc3.id]) - - - def test_remove_tag(self): - self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2) - bulk_edit.remove_tag([self.doc1.id, self.doc3.id, self.doc4.id], self.t1.id) - self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 1) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc4.id]) - - def test_delete(self): - self.assertEqual(Document.objects.count(), 5) - bulk_edit.delete([self.doc1.id, self.doc2.id]) - self.assertEqual(Document.objects.count(), 3) - self.assertCountEqual([doc.id for doc in Document.objects.all()], [self.doc3.id, self.doc4.id, self.doc5.id]) - - def test_api(self): - self.assertEqual(Document.objects.count(), 5) - response = self.client.post("/api/documents/bulk_edit/", json.dumps({ - "documents": [self.doc1.id], - "method": "delete", - "parameters": {} - }), content_type='application/json') + response = self.client.get("/api/saved_views/") self.assertEqual(response.status_code, 200) - self.assertEqual(Document.objects.count(), 4) + self.assertEqual(response.data['count'], 0) - def test_api_invalid_doc(self): - self.assertEqual(Document.objects.count(), 5) - response = self.client.post("/api/documents/bulk_edit/", json.dumps({ - "documents": [-235], - "method": "delete", - "parameters": {} - }), content_type='application/json') - self.assertEqual(response.status_code, 400) - self.assertEqual(Document.objects.count(), 5) + self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 404) - def test_api_invalid_method(self): - self.assertEqual(Document.objects.count(), 5) - response = self.client.post("/api/documents/bulk_edit/", json.dumps({ - "documents": [self.doc2.id], - "method": "exterminate", - "parameters": {} - }), content_type='application/json') - self.assertEqual(response.status_code, 400) - self.assertEqual(Document.objects.count(), 5) + self.client.force_login(user=u1) + + response = self.client.get("/api/saved_views/") + self.assertEqual(response.status_code, 200) + self.assertEqual(response.data['count'], 1) + + self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 200) + + self.client.force_login(user=u2) + + response = self.client.get("/api/saved_views/") + self.assertEqual(response.status_code, 200) + self.assertEqual(response.data['count'], 2) + + self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 404) + + def test_create_update_patch(self): + + u1 = User.objects.create_user("user1") + + view = { + "name": "test", + "show_on_dashboard": True, + "show_in_sidebar": True, + "sort_field": "created2", + "filter_rules": [ + { + "rule_type": 4, + "value": "test" + } + ] + } + + response = self.client.post("/api/saved_views/", view, format='json') + self.assertEqual(response.status_code, 201) + + v1 = SavedView.objects.get(name="test") + self.assertEqual(v1.sort_field, "created2") + self.assertEqual(v1.filter_rules.count(), 1) + self.assertEqual(v1.user, self.user) + + response = self.client.patch(f"/api/saved_views/{v1.id}/", { + "show_in_sidebar": False + }, format='json') + + v1 = SavedView.objects.get(id=v1.id) + self.assertEqual(response.status_code, 200) + self.assertFalse(v1.show_in_sidebar) + self.assertEqual(v1.filter_rules.count(), 1) + + view['filter_rules'] = [{ + "rule_type": 12, + "value": "secret" + }] + + response = self.client.put(f"/api/saved_views/{v1.id}/", view, format='json') + self.assertEqual(response.status_code, 200) + + v1 = SavedView.objects.get(id=v1.id) + self.assertEqual(v1.filter_rules.count(), 1) + self.assertEqual(v1.filter_rules.first().value, "secret") + + view['filter_rules'] = [] + + response = self.client.put(f"/api/saved_views/{v1.id}/", view, format='json') + self.assertEqual(response.status_code, 200) + + v1 = SavedView.objects.get(id=v1.id) + self.assertEqual(v1.filter_rules.count(), 0) diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py index dec89c45b..2e60065f1 100644 --- a/src/documents/tests/test_file_handling.py +++ b/src/documents/tests/test_file_handling.py @@ -9,6 +9,7 @@ from unittest import mock from django.conf import settings from django.db import DatabaseError from django.test import TestCase, override_settings +from django.utils import timezone from .utils import DirectoriesMixin from ..file_handling import generate_filename, create_source_path_directory, delete_empty_directories, \ @@ -298,23 +299,23 @@ class TestFileHandling(DirectoriesMixin, TestCase): @override_settings(PAPERLESS_FILENAME_FORMAT="{created_year}-{created_month}-{created_day}") def test_created_year_month_day(self): - d1 = datetime.datetime(2020, 3, 6, 1, 1, 1) + d1 = timezone.make_aware(datetime.datetime(2020, 3, 6, 1, 1, 1)) doc1 = Document.objects.create(title="doc1", mime_type="application/pdf", created=d1) self.assertEqual(generate_filename(doc1), "2020-03-06.pdf") - doc1.created = datetime.datetime(2020, 11, 16, 1, 1, 1) + doc1.created = timezone.make_aware(datetime.datetime(2020, 11, 16, 1, 1, 1)) self.assertEqual(generate_filename(doc1), "2020-11-16.pdf") @override_settings(PAPERLESS_FILENAME_FORMAT="{added_year}-{added_month}-{added_day}") def test_added_year_month_day(self): - d1 = datetime.datetime(232, 1, 9, 1, 1, 1) + d1 = timezone.make_aware(datetime.datetime(232, 1, 9, 1, 1, 1)) doc1 = Document.objects.create(title="doc1", mime_type="application/pdf", added=d1) self.assertEqual(generate_filename(doc1), "232-01-09.pdf") - doc1.added = datetime.datetime(2020, 11, 16, 1, 1, 1) + doc1.added = timezone.make_aware(datetime.datetime(2020, 11, 16, 1, 1, 1)) self.assertEqual(generate_filename(doc1), "2020-11-16.pdf") @@ -599,7 +600,7 @@ class TestFilenameGeneration(TestCase): PAPERLESS_FILENAME_FORMAT="{created}" ) def test_date(self): - doc = Document.objects.create(title="does not matter", created=datetime.datetime(2020,5,21, 7,36,51, 153), mime_type="application/pdf", pk=2, checksum="2") + doc = Document.objects.create(title="does not matter", created=timezone.make_aware(datetime.datetime(2020,5,21, 7,36,51, 153)), mime_type="application/pdf", pk=2, checksum="2") self.assertEqual(generate_filename(doc), "2020-05-21.pdf") diff --git a/src/documents/tests/test_index.py b/src/documents/tests/test_index.py index 830fca0e0..2baa9621d 100644 --- a/src/documents/tests/test_index.py +++ b/src/documents/tests/test_index.py @@ -1,6 +1,9 @@ from django.test import TestCase +from documents import index from documents.index import JsonFormatter +from documents.models import Document +from documents.tests.utils import DirectoriesMixin class JsonFormatterTest(TestCase): @@ -12,3 +15,21 @@ class JsonFormatterTest(TestCase): self.assertListEqual(self.formatter.format([]), []) +class TestAutoComplete(DirectoriesMixin, TestCase): + + def test_auto_complete(self): + + doc1 = Document.objects.create(title="doc1", checksum="A", content="test test2 test3") + doc2 = Document.objects.create(title="doc2", checksum="B", content="test test2") + doc3 = Document.objects.create(title="doc3", checksum="C", content="test2") + + index.add_or_update_document(doc1) + index.add_or_update_document(doc2) + index.add_or_update_document(doc3) + + ix = index.open_index() + + self.assertListEqual(index.autocomplete(ix, "tes"), [b"test3", b"test", b"test2"]) + self.assertListEqual(index.autocomplete(ix, "tes", limit=3), [b"test3", b"test", b"test2"]) + self.assertListEqual(index.autocomplete(ix, "tes", limit=1), [b"test3"]) + self.assertListEqual(index.autocomplete(ix, "tes", limit=0), []) diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py index 725e87617..0554cd7cd 100644 --- a/src/documents/tests/test_sanity_check.py +++ b/src/documents/tests/test_sanity_check.py @@ -2,6 +2,8 @@ import os import shutil from pathlib import Path +import filelock +from django.conf import settings from django.test import TestCase from documents.models import Document @@ -13,9 +15,11 @@ class TestSanityCheck(DirectoriesMixin, TestCase): def make_test_data(self): - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000001.pdf"), os.path.join(self.dirs.originals_dir, "0000001.pdf")) - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "archive", "0000001.pdf"), os.path.join(self.dirs.archive_dir, "0000001.pdf")) - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), os.path.join(self.dirs.thumbnail_dir, "0000001.png")) + with filelock.FileLock(settings.MEDIA_LOCK): + # just make sure that the lockfile is present. + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000001.pdf"), os.path.join(self.dirs.originals_dir, "0000001.pdf")) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "archive", "0000001.pdf"), os.path.join(self.dirs.archive_dir, "0000001.pdf")) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), os.path.join(self.dirs.thumbnail_dir, "0000001.png")) return Document.objects.create(title="test", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", content="test", pk=1, filename="0000001.pdf", mime_type="application/pdf") diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py index 7f9d50ed5..dfefc4061 100644 --- a/src/documents/tests/utils.py +++ b/src/documents/tests/utils.py @@ -34,7 +34,8 @@ def setup_directories(): ARCHIVE_DIR=dirs.archive_dir, CONSUMPTION_DIR=dirs.consumption_dir, INDEX_DIR=dirs.index_dir, - MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle") + MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle"), + MEDIA_LOCK=os.path.join(dirs.media_dir, "media.lock") ) dirs.settings_override.enable() diff --git a/src/documents/views.py b/src/documents/views.py index 3924f3d1a..ebe41c9d1 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -55,6 +55,11 @@ from .serialisers import ( class IndexView(TemplateView): template_name = "index.html" + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['cookie_prefix'] = settings.COOKIE_PREFIX + return context + class CorrespondentViewSet(ModelViewSet): model = Correspondent @@ -185,7 +190,12 @@ class DocumentViewSet(RetrieveModelMixin, parser_class = get_parser_class_for_mime_type(mime_type) if parser_class: parser = parser_class(logging_group=None) - return parser.extract_metadata(file, mime_type) + + try: + return parser.extract_metadata(file, mime_type) + except Exception as e: + # TODO: cover GPG errors, remove later. + return [] else: return [] @@ -231,7 +241,12 @@ class DocumentViewSet(RetrieveModelMixin, @cache_control(public=False, max_age=315360000) def thumb(self, request, pk=None): try: - return HttpResponse(Document.objects.get(id=pk).thumbnail_file, + doc = Document.objects.get(id=pk) + if doc.storage_type == Document.STORAGE_TYPE_GPG: + handle = GnuPG.decrypted(doc.thumbnail_file) + else: + handle = doc.thumbnail_file + return HttpResponse(handle, content_type='image/png') except (FileNotFoundError, Document.DoesNotExist): raise Http404() diff --git a/src/paperless/version.py b/src/paperless/version.py index 527e0668d..10283c145 100644 --- a/src/paperless/version.py +++ b/src/paperless/version.py @@ -1 +1 @@ -__version__ = (0, 9, 6) +__version__ = (0, 9, 8) diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py index a82c34f15..3c200362d 100644 --- a/src/paperless_mail/mail.py +++ b/src/paperless_mail/mail.py @@ -26,7 +26,7 @@ class BaseMailAction: return {} def post_consume(self, M, message_uids, parameter): - pass + pass # pragma: nocover class DeleteMailAction(BaseMailAction): @@ -69,7 +69,7 @@ def get_rule_action(rule): elif rule.action == MailRule.ACTION_MARK_READ: return MarkReadMailAction() else: - raise ValueError("Unknown action.") + raise NotImplementedError("Unknown action.") # pragma: nocover def make_criterias(rule): @@ -95,7 +95,7 @@ def get_mailbox(server, port, security): elif security == MailAccount.IMAP_SECURITY_SSL: mailbox = MailBox(server, port) else: - raise ValueError("Unknown IMAP security") + raise NotImplementedError("Unknown IMAP security") # pragma: nocover return mailbox @@ -119,7 +119,7 @@ class MailAccountHandler(LoggingMixin): return os.path.splitext(os.path.basename(att.filename))[0] else: - raise ValueError("Unknown title selector.") + raise NotImplementedError("Unknown title selector.") # pragma: nocover # NOQA: E501 def get_correspondent(self, message, rule): c_from = rule.assign_correspondent_from @@ -141,7 +141,7 @@ class MailAccountHandler(LoggingMixin): return rule.assign_correspondent else: - raise ValueError("Unknwown correspondent selector") + raise NotImplementedError("Unknwown correspondent selector") # pragma: nocover # NOQA: E501 def handle_mail_account(self, account): diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py index 2a391a268..9c0f52c53 100644 --- a/src/paperless_mail/tests/test_mail.py +++ b/src/paperless_mail/tests/test_mail.py @@ -399,7 +399,7 @@ class TestMail(TestCase): c = Correspondent.objects.get(name="amazon@amazon.de") # should work - self.assertEquals(kwargs['override_correspondent_id'], c.id) + self.assertEqual(kwargs['override_correspondent_id'], c.id) self.async_task.reset_mock() self.reset_bogus_mailbox() @@ -411,7 +411,7 @@ class TestMail(TestCase): args, kwargs = self.async_task.call_args self.async_task.assert_called_once() - self.assertEquals(kwargs['override_correspondent_id'], None) + self.assertEqual(kwargs['override_correspondent_id'], None) def test_filters(self): diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py index f8f369ab0..7e488ca37 100644 --- a/src/paperless_text/parsers.py +++ b/src/paperless_text/parsers.py @@ -1,6 +1,7 @@ import os import subprocess +from PIL import ImageDraw, ImageFont, Image from django.conf import settings from documents.parsers import DocumentParser, ParseError @@ -12,63 +13,22 @@ class TextDocumentParser(DocumentParser): """ def get_thumbnail(self, document_path, mime_type): - """ - The thumbnail of a text file is just a 500px wide image of the text - rendered onto a letter-sized page. - """ - # The below is heavily cribbed from https://askubuntu.com/a/590951 - - bg_color = "white" # bg color - text_color = "black" # text color - psize = [500, 647] # icon size - n_lines = 50 # number of lines to show - out_path = os.path.join(self.tempdir, "convert.png") - - temp_bg = os.path.join(self.tempdir, "bg.png") - temp_txlayer = os.path.join(self.tempdir, "tx.png") - picsize = "x".join([str(n) for n in psize]) - txsize = "x".join([str(n - 8) for n in psize]) - - def create_bg(): - work_size = ",".join([str(n - 1) for n in psize]) - r = str(round(psize[0] / 10)) - rounded = ",".join([r, r]) - run_command( - settings.CONVERT_BINARY, - "-size ", picsize, - ' xc:none -draw ', - '"fill ', bg_color, ' roundrectangle 0,0,', work_size, ",", rounded, '" ', # NOQA: E501 - temp_bg - ) def read_text(): with open(document_path, 'r') as src: lines = [line.strip() for line in src.readlines()] - text = "\n".join([line for line in lines[:n_lines]]) - return text.replace('"', "'") + text = "\n".join(lines[:50]) + return text - def create_txlayer(): - run_command( - settings.CONVERT_BINARY, - "-background none", - "-fill", - text_color, - "-pointsize", "12", - "-border 4 -bordercolor none", - "-size ", txsize, - ' caption:"', read_text(), '" ', - temp_txlayer - ) + img = Image.new("RGB", (500, 700), color="white") + draw = ImageDraw.Draw(img) + font = ImageFont.truetype( + "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf", 20, + layout_engine=ImageFont.LAYOUT_BASIC) + draw.text((5, 5), read_text(), font=font, fill="black") - create_txlayer() - create_bg() - run_command( - settings.CONVERT_BINARY, - temp_bg, - temp_txlayer, - "-background None -layers merge ", - out_path - ) + out_path = os.path.join(self.tempdir, "thumb.png") + img.save(out_path) return out_path diff --git a/src/paperless_text/tests/samples/test.txt b/src/paperless_text/tests/samples/test.txt new file mode 100644 index 000000000..6de7b8c69 --- /dev/null +++ b/src/paperless_text/tests/samples/test.txt @@ -0,0 +1 @@ +This is a test file. diff --git a/src/paperless_text/tests/test_parser.py b/src/paperless_text/tests/test_parser.py new file mode 100644 index 000000000..413aa91cf --- /dev/null +++ b/src/paperless_text/tests/test_parser.py @@ -0,0 +1,26 @@ +import os + +from django.test import TestCase + +from documents.tests.utils import DirectoriesMixin +from paperless_text.parsers import TextDocumentParser + + +class TestTextParser(DirectoriesMixin, TestCase): + + def test_thumbnail(self): + + parser = TextDocumentParser(None) + + # just make sure that it does not crash + f = parser.get_thumbnail(os.path.join(os.path.dirname(__file__), "samples", "test.txt"), "text/plain") + self.assertTrue(os.path.isfile(f)) + + def test_parse(self): + + parser = TextDocumentParser(None) + + parser.parse(os.path.join(os.path.dirname(__file__), "samples", "test.txt"), "text/plain") + + self.assertEqual(parser.get_text(), "This is a test file.\n") + self.assertIsNone(parser.get_archive_path()) From 55a6dca373660a88931e03b7f80f9b9c10f48404 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 18 Dec 2020 16:03:52 -0800 Subject: [PATCH 08/92] Refactor editor and filterable dropdowns to be common components in anticipation of bulk editor --- src-ui/src/app/app.module.ts | 14 ++++---- .../date-dropdown.component.html} | 2 +- .../date-dropdown.component.scss} | 2 +- .../date-dropdown.component.spec.ts} | 12 +++---- .../date-dropdown/date-dropdown.component.ts} | 36 +++++++++---------- ...filterable-dropdown-button.component.html} | 0 ...filterable-dropdown-button.component.scss} | 0 ...lterable-dropdown-button.component.spec.ts | 25 +++++++++++++ .../filterable-dropdown-button.component.ts} | 8 ++--- .../filterable-dropdown.component.html} | 4 +-- .../filterable-dropdown.component.scss} | 0 .../filterable-dropdown.component.spec.ts | 25 +++++++++++++ .../filterable-dropdown.component.ts} | 12 +++---- .../document-list/document-list.component.ts | 2 +- .../filter-editor.component.html | 10 +++--- .../filter-editor.component.scss | 0 .../filter-editor.component.spec.ts | 0 .../filter-editor/filter-editor.component.ts | 8 ++--- .../filter-dropdown-date.component.spec.ts | 25 ------------- .../filter-dropdown-button.component.spec.ts | 25 ------------- 20 files changed, 105 insertions(+), 105 deletions(-) rename src-ui/src/app/components/{filter-editor/filter-dropdown-date/filter-dropdown-date.component.html => common/date-dropdown/date-dropdown.component.html} (95%) rename src-ui/src/app/components/{filter-editor/filter-dropdown-date/filter-dropdown-date.component.scss => common/date-dropdown/date-dropdown.component.scss} (78%) rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown.component.spec.ts => common/date-dropdown/date-dropdown.component.spec.ts} (51%) rename src-ui/src/app/components/{filter-editor/filter-dropdown-date/filter-dropdown-date.component.ts => common/date-dropdown/date-dropdown.component.ts} (70%) rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.html => common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html} (100%) rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.scss => common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.scss} (100%) create mode 100644 src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.spec.ts rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts => common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts} (74%) rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown.component.html => common/filterable-dropdown/filterable-dropdown.component.html} (86%) rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown.component.scss => common/filterable-dropdown/filterable-dropdown.component.scss} (100%) create mode 100644 src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts rename src-ui/src/app/components/{filter-editor/filter-dropdown/filter-dropdown.component.ts => common/filterable-dropdown/filterable-dropdown.component.ts} (81%) rename src-ui/src/app/components/{ => document-list}/filter-editor/filter-editor.component.html (51%) rename src-ui/src/app/components/{ => document-list}/filter-editor/filter-editor.component.scss (100%) rename src-ui/src/app/components/{ => document-list}/filter-editor/filter-editor.component.spec.ts (100%) rename src-ui/src/app/components/{ => document-list}/filter-editor/filter-editor.component.ts (98%) delete mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts delete mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 6c4cabe92..97c547038 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -26,10 +26,10 @@ import { ResultHighlightComponent } from './components/search/result-highlight/r import { PageHeaderComponent } from './components/common/page-header/page-header.component'; import { AppFrameComponent } from './components/app-frame/app-frame.component'; import { ToastsComponent } from './components/common/toasts/toasts.component'; -import { FilterEditorComponent } from './components/filter-editor/filter-editor.component'; -import { FilterDropdownComponent } from './components/filter-editor/filter-dropdown/filter-dropdown.component'; -import { FilterDropdownButtonComponent } from './components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component'; -import { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown-date/filter-dropdown-date.component'; +import { FilterEditorComponent } from './components/document-list/filter-editor/filter-editor.component'; +import { FilterableDropdownComponent } from './components/common/filterable-dropdown/filterable-dropdown.component'; +import { FilterableDropdownButtonComponent } from './components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component'; +import { DateDropdownComponent } from './components/common/date-dropdown/date-dropdown.component'; import { DocumentCardLargeComponent } from './components/document-list/document-card-large/document-card-large.component'; import { DocumentCardSmallComponent } from './components/document-list/document-card-small/document-card-small.component'; import { BulkEditorComponent } from './components/document-list/bulk-editor/bulk-editor.component'; @@ -81,9 +81,9 @@ import { NgSelectModule } from '@ng-select/ng-select'; AppFrameComponent, ToastsComponent, FilterEditorComponent, - FilterDropdownComponent, - FilterDropdownButtonComponent, - FilterDropdownDateComponent, + FilterableDropdownComponent, + FilterableDropdownButtonComponent, + DateDropdownComponent, DocumentCardLargeComponent, DocumentCardSmallComponent, BulkEditorComponent, diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html similarity index 95% rename from src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html rename to src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index aca6e836c..ba9f1fafb 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -2,7 +2,7 @@ -
+
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss similarity index 100% rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss rename to src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts new file mode 100644 index 000000000..3eef95c16 --- /dev/null +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FilterableDropodownComponent } from './filterable-dropdown.component'; + +describe('FilterableDropodownComponent', () => { + let component: FilterableDropodownComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ FilterableDropodownComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(FilterableDropodownComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts similarity index 81% rename from src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts rename to src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index b9d3fca6f..0f7f937aa 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -4,11 +4,11 @@ import { FilterPipe } from 'src/app/pipes/filter.pipe'; import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' @Component({ - selector: 'app-filter-dropdown', - templateUrl: './filter-dropdown.component.html', - styleUrls: ['./filter-dropdown.component.scss'] + selector: 'app-filterable-dropdown', + templateUrl: './filterable-dropdown.component.html', + styleUrls: ['./filterable-dropdown.component.scss'] }) -export class FilterDropdownComponent { +export class FilterableDropdownComponent { constructor(private filterPipe: FilterPipe) { } @@ -28,7 +28,7 @@ export class FilterDropdownComponent { toggle = new EventEmitter() @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef - @ViewChild('filterDropdown') filterDropdown: NgbDropdown + @ViewChild('dropdown') dropdown: NgbDropdown filterText: string @@ -53,6 +53,6 @@ export class FilterDropdownComponent { listFilterEnter(): void { let filtered = this.filterPipe.transform(this.items, this.filterText) if (filtered.length == 1) this.toggleItem(filtered.shift()) - this.filterDropdown.close() + this.dropdown.close() } } diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index a8bdf89d3..fd0b7ab31 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -11,7 +11,7 @@ import { DocumentService, DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/doc import { TagService } from 'src/app/services/rest/tag.service'; import { SavedViewService } from 'src/app/services/rest/saved-view.service'; import { Toast, ToastService } from 'src/app/services/toast.service'; -import { FilterEditorComponent } from '../filter-editor/filter-editor.component'; +import { FilterEditorComponent } from './filter-editor/filter-editor.component'; import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'; import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component'; import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component'; diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html similarity index 51% rename from src-ui/src/app/components/filter-editor/filter-editor.component.html rename to src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index 6847a2902..2d480bfed 100644 --- a/src-ui/src/app/components/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -8,11 +8,11 @@
- - - - - + + + + +
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.scss b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss similarity index 100% rename from src-ui/src/app/components/filter-editor/filter-editor.component.scss rename to src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.spec.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts similarity index 100% rename from src-ui/src/app/components/filter-editor/filter-editor.component.spec.ts rename to src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts similarity index 98% rename from src-ui/src/app/components/filter-editor/filter-editor.component.ts rename to src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index 913c738a5..2d88579f9 100644 --- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -10,7 +10,7 @@ import { TagService } from 'src/app/services/rest/tag.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { FilterRule } from 'src/app/data/filter-rule'; import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES, FILTER_TITLE } from 'src/app/data/filter-rule-type'; -import { DateSelection } from './filter-dropdown-date/filter-dropdown-date.component'; +import { DateSelection } from 'src/app/components/common/date-dropdown/date-dropdown.component'; @Component({ selector: 'app-filter-editor', @@ -23,7 +23,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { if (this.filterRules.length == 1) { let rule = this.filterRules[0] switch(this.filterRules[0].rule_type) { - + case FILTER_CORRESPONDENT: return `Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}` @@ -55,7 +55,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { @Output() filterRulesChange = new EventEmitter() - + hasFilters() { return this.filterRules.length > 0 } @@ -123,7 +123,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { let existingRule = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID && rule.value == value?.toString()) let existingRuleOfSameType = this.filterRules.find(rule => rule.rule_type == filterRuleTypeID) - + if (existingRule) { // if this exact rule already exists, remove it in all cases. this.filterRules.splice(this.filterRules.indexOf(existingRule), 1) diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts deleted file mode 100644 index 6bf59e2e7..000000000 --- a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { FilterDropdownDateComponent } from './filter-dropdown-date.component'; - -describe('FilterDropdownDateComponent', () => { - let component: FilterDropdownDateComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ FilterDropdownDateComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(FilterDropdownDateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts deleted file mode 100644 index 5cf1fefa2..000000000 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { FilterDropodownButtonComponent } from './filter-dropdown-button.component'; - -describe('FilterDropodownButtonComponent', () => { - let component: FilterDropodownButtonComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ FilterDropodownButtonComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(FilterDropodownButtonComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); From 01d448ecde9dffba833d89bb4c50f59593c8027b Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 18 Dec 2020 21:19:49 -0800 Subject: [PATCH 09/92] Bulk editor component skeleton --- .../filterable-dropdown.component.ts | 4 + .../bulk-editor/bulk-editor.component.html | 95 ++++--------------- .../bulk-editor/bulk-editor.component.scss | 10 -- .../bulk-editor/bulk-editor.component.ts | 75 ++++++++++++++- .../document-list.component.html | 22 ++--- 5 files changed, 107 insertions(+), 99 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 0f7f937aa..cecbdf9fa 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -27,6 +27,9 @@ export class FilterableDropdownComponent { @Output() toggle = new EventEmitter() + @Output() + close = new EventEmitter() + @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef @ViewChild('dropdown') dropdown: NgbDropdown @@ -47,6 +50,7 @@ export class FilterableDropdownComponent { }, 0); } else { this.filterText = '' + this.close.emit(this.itemsSelected) } } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index d330ba228..bf8f7b732 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1,89 +1,34 @@ -
-
-
- -
- - -
-
- -
- - +
+
+
+ + + +
-
- -
- - -
-
-
- -
- - -
-
-
- -
-
- - - - - - Add - - - - - - - Edit - - - - - - - Remove - diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss index 5afd86545..e69de29bb 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss @@ -1,10 +0,0 @@ -.btn svg { - width: 0.9em; - height: 0.9em; - margin-right: 3px; - margin-top: -1px; -} - -.btn-sm { - line-height: 1; -} diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 5c1ad01ae..e5f722dc7 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -1,5 +1,12 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DocumentListViewService } from 'src/app/services/document-list-view.service'; +import { PaperlessTag } from 'src/app/data/paperless-tag'; +import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; +import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; +import { PaperlessDocument } from 'src/app/data/paperless-document'; +import { TagService } from 'src/app/services/rest/tag.service'; +import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; +import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; +import { DocumentService } from 'src/app/services/rest/document.service'; @Component({ selector: 'app-bulk-editor', @@ -9,7 +16,10 @@ import { DocumentListViewService } from 'src/app/services/document-list-view.ser export class BulkEditorComponent { @Input() - list: DocumentListViewService + documentsSelected: Set + + @Input() + allDocuments: PaperlessDocument[] @Output() selectPage = new EventEmitter() @@ -41,6 +51,65 @@ export class BulkEditorComponent { @Output() delete = new EventEmitter() - constructor( ) { } + tags: PaperlessTag[] + correspondents: PaperlessCorrespondent[] + documentTypes: PaperlessDocumentType[] + get selectedTags(): PaperlessTag[] { + let selectedTags = [] + this.allDocuments.forEach(d => { + if (this.documentsSelected.has(d.id)) { + if (d.tags && !d.tags.every(t => selectedTags.find(st => st.id == t) !== undefined)) d.tags$.subscribe(t => selectedTags = selectedTags.concat(t)) + } + }) + return selectedTags + } + + get selectedCorrespondents(): PaperlessCorrespondent[] { + let selectedCorrespondents = [] + this.allDocuments.forEach(d => { + if (this.documentsSelected.has(d.id)) { + if (d.correspondent && selectedCorrespondents.find(sc => sc.id == d.correspondent) == undefined) d.correspondent$.subscribe(c => selectedCorrespondents.push(c)) + } + }) + return selectedCorrespondents + } + + get selectedDocumentTypes(): PaperlessDocumentType[] { + let selectedDocumentTypes = [] + this.allDocuments.forEach(d => { + if (this.documentsSelected.has(d.id)) { + if (d.document_type && selectedDocumentTypes.find(sdt => sdt.id == d.document_type) == undefined) d.document_type$.subscribe(dt => selectedDocumentTypes.push(dt)) + } + }) + return selectedDocumentTypes + } + + constructor( + private documentTypeService: DocumentTypeService, + private tagService: TagService, + private correspondentService: CorrespondentService, + private documentService: DocumentService + ) { } + + ngOnInit() { + this.tagService.listAll().subscribe(result => this.tags = result.results) + this.correspondentService.listAll().subscribe(result => this.correspondents = result.results) + this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results) + } + + applyTags(tags) { + console.log(tags); + + } + + applyCorrespondent(correspondent) { + console.log(correspondent); + + } + + applyDocumentType(documentType) { + console.log(documentType); + + } } 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 5b4511866..beb779636 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 @@ -78,17 +78,11 @@
- -
+ -
-

Selected {{list.selected.size}} of {{list.collectionSize || 0}} document(s) (filtered)

- -
- -
- - + +
+ +
+

Selected {{list.selected.size}} of {{list.collectionSize || 0}} document(s) (filtered)

+
From 275bd96ba85778769a787c6da3562df610c13529 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 00:13:08 -0800 Subject: [PATCH 10/92] Refactor filterable dropdowns to allow intermediate state --- .../filterable-dropdown-button.component.html | 4 +- .../filterable-dropdown-button.component.ts | 19 ++++++-- .../filterable-dropdown.component.html | 6 +-- .../filterable-dropdown.component.ts | 46 +++++++++++++++---- src-ui/src/app/pipes/filter.pipe.ts | 13 +++--- 5 files changed, 62 insertions(+), 26 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html index 0ea870533..5b58025d1 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html @@ -1,7 +1,7 @@
-
- - +
+ +
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index cecbdf9fa..8a6ed7c8b 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -1,8 +1,22 @@ import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core'; import { ObjectWithId } from 'src/app/data/object-with-id'; +import { PaperlessTag } from 'src/app/data/paperless-tag'; +import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; +import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { FilterPipe } from 'src/app/pipes/filter.pipe'; import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' +export interface SelectableItem { + item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent, + state: SelectableItemState +} + +export enum SelectableItemState { + NotSelected = 0, + Selected = 1, + PartiallySelected = 2 +} + @Component({ selector: 'app-filterable-dropdown', templateUrl: './filterable-dropdown.component.html', @@ -13,10 +27,26 @@ export class FilterableDropdownComponent { constructor(private filterPipe: FilterPipe) { } @Input() - items: ObjectWithId[] + set items(items: ObjectWithId[]) { + if (items) { + this.selectableItems = items.map(i => { + return {item: i, state: SelectableItemState.NotSelected} + }) + } + } + + selectableItems: SelectableItem[] = [] @Input() - itemsSelected: ObjectWithId[] + set itemsSelected(itemsSelected: ObjectWithId[]) { + this.selectableItems.forEach(i => { + i.state = (itemsSelected.find(is => is.id == i.item.id)) ? SelectableItemState.Selected : SelectableItemState.NotSelected + }) + } + + get itemsSelected() :ObjectWithId[] { + return this.selectableItems.filter(si => si.state == SelectableItemState.Selected).map(si => si.item) + } @Input() title: string @@ -35,12 +65,8 @@ export class FilterableDropdownComponent { filterText: string - toggleItem(item: ObjectWithId): void { - this.toggle.emit(item) - } - - isItemSelected(item: ObjectWithId): boolean { - return this.itemsSelected?.find(i => i.id == item.id) !== undefined + toggleItem(selectableItem: SelectableItem): void { + this.toggle.emit(selectableItem.item) } dropdownOpenChange(open: boolean): void { @@ -50,12 +76,12 @@ export class FilterableDropdownComponent { }, 0); } else { this.filterText = '' - this.close.emit(this.itemsSelected) + this.close.next() } } listFilterEnter(): void { - let filtered = this.filterPipe.transform(this.items, this.filterText) + let filtered = this.filterPipe.transform(this.selectableItems, this.filterText) if (filtered.length == 1) this.toggleItem(filtered.shift()) this.dropdown.close() } diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts index f799f40cc..51d1924b8 100644 --- a/src-ui/src/app/pipes/filter.pipe.ts +++ b/src-ui/src/app/pipes/filter.pipe.ts @@ -1,16 +1,17 @@ import { Pipe, PipeTransform } from '@angular/core'; +import { SelectableItem } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; @Pipe({ name: 'filter' }) export class FilterPipe implements PipeTransform { - transform(items: any[], searchText: string): any[] { - if (!items) return []; - if (!searchText) return items; + transform(selectableItems: SelectableItem[], searchText: string): any[] { + if (!selectableItems) return []; + if (!searchText) return selectableItems; - return items.filter(item => { - return Object.keys(item).some(key => { - return String(item[key]).toLowerCase().includes(searchText.toLowerCase()); + return selectableItems.filter(selectableItem => { + return Object.keys(selectableItem.item).some(key => { + return String(selectableItem.item[key]).toLowerCase().includes(searchText.toLowerCase()); }); }); } From 24c53e78a74234fa281958a64e6f85cd25f49789 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 02:08:33 -0800 Subject: [PATCH 11/92] Working bulk editor component --- .../filterable-dropdown-button.component.ts | 2 +- .../filterable-dropdown.component.html | 4 +- .../filterable-dropdown.component.ts | 40 +++++++-- .../bulk-editor/bulk-editor.component.html | 15 +++- .../bulk-editor/bulk-editor.component.ts | 86 ++++++++++--------- .../document-list.component.html | 11 +-- .../document-list/document-list.component.ts | 13 ++- 7 files changed, 109 insertions(+), 62 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts index 366bd19b4..a928d715e 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts @@ -35,7 +35,7 @@ export class FilterableDropdownButtonComponent implements OnInit { getSelectedIconName() { let iconName = '' if (this.selectableItem?.state == SelectableItemState.Selected) iconName = 'check' - else if (this.selectableItem?.state == SelectableItemState.PartiallySelected) iconName = 'minus' + else if (this.selectableItem?.state == SelectableItemState.PartiallySelected) iconName = 'dash' return iconName } } diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 257cec1e5..870ea41e4 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -1,12 +1,12 @@
- +
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index e5f722dc7..ae3d75aff 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -7,6 +7,7 @@ import { TagService } from 'src/app/services/rest/tag.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { DocumentService } from 'src/app/services/rest/document.service'; +import { SelectableItem, SelectableItemState } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; @Component({ selector: 'app-bulk-editor', @@ -16,7 +17,7 @@ import { DocumentService } from 'src/app/services/rest/document.service'; export class BulkEditorComponent { @Input() - documentsSelected: Set + selectedDocuments: Set @Input() allDocuments: PaperlessDocument[] @@ -33,20 +34,11 @@ export class BulkEditorComponent { @Output() setCorrespondent = new EventEmitter() - @Output() - removeCorrespondent = new EventEmitter() - @Output() setDocumentType = new EventEmitter() @Output() - removeDocumentType = new EventEmitter() - - @Output() - addTag = new EventEmitter() - - @Output() - removeTag = new EventEmitter() + setTags = new EventEmitter() @Output() delete = new EventEmitter() @@ -55,34 +47,47 @@ export class BulkEditorComponent { correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] - get selectedTags(): PaperlessTag[] { - let selectedTags = [] - this.allDocuments.forEach(d => { - if (this.documentsSelected.has(d.id)) { - if (d.tags && !d.tags.every(t => selectedTags.find(st => st.id == t) !== undefined)) d.tags$.subscribe(t => selectedTags = selectedTags.concat(t)) - } + get tagsSelectableItems(): SelectableItem[] { + let tagsSelectableItems = [] + let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) + this.tags.forEach(t => { + let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id)) + let state = SelectableItemState.NotSelected + if (selectedDocumentsWithTag.length == selectedDocuments.length) state = SelectableItemState.Selected + else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected + tagsSelectableItems.push( { item: t, state: state } ) }) - return selectedTags + return tagsSelectableItems } - get selectedCorrespondents(): PaperlessCorrespondent[] { - let selectedCorrespondents = [] - this.allDocuments.forEach(d => { - if (this.documentsSelected.has(d.id)) { - if (d.correspondent && selectedCorrespondents.find(sc => sc.id == d.correspondent) == undefined) d.correspondent$.subscribe(c => selectedCorrespondents.push(c)) - } + get correspondentsSelectableItems(): SelectableItem[] { + let correspondentsSelectableItems = [] + let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) + + this.correspondents.forEach(c => { + let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id) + let state = SelectableItemState.NotSelected + if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = SelectableItemState.Selected + else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected + correspondentsSelectableItems.push( { item: c, state: state } ) }) - return selectedCorrespondents + + return correspondentsSelectableItems } - get selectedDocumentTypes(): PaperlessDocumentType[] { - let selectedDocumentTypes = [] - this.allDocuments.forEach(d => { - if (this.documentsSelected.has(d.id)) { - if (d.document_type && selectedDocumentTypes.find(sdt => sdt.id == d.document_type) == undefined) d.document_type$.subscribe(dt => selectedDocumentTypes.push(dt)) - } + get documentTypesSelectableItems(): SelectableItem[] { + let documentTypesSelectableItems = [] + let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) + + this.documentTypes.forEach(dt => { + let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id) + let state = SelectableItemState.NotSelected + if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = SelectableItemState.Selected + else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected + documentTypesSelectableItems.push( { item: dt, state: state } ) }) - return selectedDocumentTypes + + return documentTypesSelectableItems } constructor( @@ -98,18 +103,19 @@ export class BulkEditorComponent { this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results) } - applyTags(tags) { - console.log(tags); - + applyTags(tags: PaperlessTag[]) { + this.setTags.emit(tags) } - applyCorrespondent(correspondent) { - console.log(correspondent); - + applyCorrespondent(selectedCorrespondent: ObjectWithId[]) { + this.setCorrespondent.emit(selectedCorrespondent) } - applyDocumentType(documentType) { - console.log(documentType); + applyDocumentType(selectedDocumentType: ObjectWithId[]) { + this.setDocumentType.emit(selectedDocumentType) + } + applyDelete() { + this.delete.next() } } 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 beb779636..b32ff52f7 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 @@ -82,16 +82,13 @@
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index fd0b7ab31..a3f7f1e12 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -139,7 +139,9 @@ export class DocumentListComponent implements OnInit { ) } - bulkSetCorrespondent() { + bulkSetCorrespondent(correspondent) { + console.log(correspondent); + let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Select correspondent" modal.componentInstance.message = `Select the correspondent you wish to assign to ${this.list.selected.size} selected document(s):` @@ -166,7 +168,9 @@ export class DocumentListComponent implements OnInit { }) } - bulkSetDocumentType() { + bulkSetDocumentType(documentType) { + console.log(); + let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Select document type" modal.componentInstance.message = `Select the document type you wish to assign to ${this.list.selected.size} selected document(s):` @@ -193,6 +197,11 @@ export class DocumentListComponent implements OnInit { }) } + bulkSetTags(tags) { + console.log('bulkSetTags', tags); + + } + bulkAddTag() { let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Select tag" From da3695e3a4f7c93b10d88aaa713e9f48e2e6ae8c Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 02:26:41 -0800 Subject: [PATCH 12/92] Working to backend except tags --- .../bulk-editor/bulk-editor.component.ts | 4 +- .../document-list/document-list.component.ts | 67 +++++++------------ 2 files changed, 27 insertions(+), 44 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index ae3d75aff..8e6197e56 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -107,11 +107,11 @@ export class BulkEditorComponent { this.setTags.emit(tags) } - applyCorrespondent(selectedCorrespondent: ObjectWithId[]) { + applyCorrespondent(selectedCorrespondent: PaperlessCorrespondent[]) { this.setCorrespondent.emit(selectedCorrespondent) } - applyDocumentType(selectedDocumentType: ObjectWithId[]) { + applyDocumentType(selectedDocumentType: PaperlessDocumentType[]) { this.setDocumentType.emit(selectedDocumentType) } diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index a3f7f1e12..15e7987fe 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -15,6 +15,9 @@ import { FilterEditorComponent } from './filter-editor/filter-editor.component'; import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'; import { SelectDialogComponent } from '../common/select-dialog/select-dialog.component'; import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component'; +import { PaperlessTag } from 'src/app/data/paperless-tag'; +import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; +import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; @Component({ selector: 'app-document-list', @@ -139,17 +142,18 @@ export class DocumentListComponent implements OnInit { ) } - bulkSetCorrespondent(correspondent) { - console.log(correspondent); + bulkSetCorrespondent(correspondent: PaperlessCorrespondent[]) { + if (correspondent.length > 0) correspondent = correspondent.shift() + else correspondent = undefined - let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Select correspondent" - modal.componentInstance.message = `Select the correspondent you wish to assign to ${this.list.selected.size} selected document(s):` - this.correspondentService.listAll().subscribe(response => { - modal.componentInstance.objects = response.results - }) - modal.componentInstance.selectClicked.subscribe(selectedId => { - this.executeBulkOperation('set_correspondent', {"correspondent": selectedId}).subscribe( + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) + modal.componentInstance.title = "Confirm correspondent assignment" + let messageFragment = correspondent ? `assign the correspondent ${correspondent.name} to` : `remove all correspondents from` + modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` + modal.componentInstance.btnClass = "btn-warning" + modal.componentInstance.btnCaption = "Confirm" + modal.componentInstance.confirmClicked.subscribe(() => { + this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe( response => { modal.close() } @@ -157,28 +161,18 @@ export class DocumentListComponent implements OnInit { }) } - bulkRemoveCorrespondent() { + bulkSetDocumentType(documentType: PaperlessDocumentType[]) { + if (documentType.length > 0) documentType = documentType.shift() + else documentType = undefined + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Remove correspondent" - modal.componentInstance.message = `This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).` + modal.componentInstance.title = "Confirm Document Type assignment" + let messageFragment = documentType ? `assign the document type ${documentType.name} to` : `remove all document types from` + modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` + modal.componentInstance.btnClass = "btn-warning" + modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation('set_correspondent', {"correspondent": null}).subscribe(r => { - modal.close() - }) - }) - } - - bulkSetDocumentType(documentType) { - console.log(); - - let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Select document type" - modal.componentInstance.message = `Select the document type you wish to assign to ${this.list.selected.size} selected document(s):` - this.documentTypeService.listAll().subscribe(response => { - modal.componentInstance.objects = response.results - }) - modal.componentInstance.selectClicked.subscribe(selectedId => { - this.executeBulkOperation('set_document_type', {"document_type": selectedId}).subscribe( + this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe( response => { modal.close() } @@ -186,20 +180,9 @@ export class DocumentListComponent implements OnInit { }) } - bulkRemoveDocumentType() { - let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Remove document type" - modal.componentInstance.message = `This operation will remove the document type from all ${this.list.selected.size} selected document(s).` - modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation('set_document_type', {"document_type": null}).subscribe(r => { - modal.close() - }) - }) - } - bulkSetTags(tags) { console.log('bulkSetTags', tags); - + // TODO: } bulkAddTag() { From 400da7bbc5f6175b27ec2a629379b6e4c4d56384 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 07:49:32 -0800 Subject: [PATCH 13/92] Minor refactoring --- .../bulk-editor/bulk-editor.component.ts | 4 ++-- .../document-list/document-list.component.ts | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 8e6197e56..b1858e0f7 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -108,11 +108,11 @@ export class BulkEditorComponent { } applyCorrespondent(selectedCorrespondent: PaperlessCorrespondent[]) { - this.setCorrespondent.emit(selectedCorrespondent) + this.setCorrespondent.emit(selectedCorrespondent.length > 0 ? selectedCorrespondent.shift() : null) } applyDocumentType(selectedDocumentType: PaperlessDocumentType[]) { - this.setDocumentType.emit(selectedDocumentType) + this.setDocumentType.emit(selectedDocumentType.length > 0 ? selectedDocumentType.shift() : null) } applyDelete() { diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 15e7987fe..a08cb1fad 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -142,10 +142,7 @@ export class DocumentListComponent implements OnInit { ) } - bulkSetCorrespondent(correspondent: PaperlessCorrespondent[]) { - if (correspondent.length > 0) correspondent = correspondent.shift() - else correspondent = undefined - + bulkSetCorrespondent(correspondent: PaperlessCorrespondent) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm correspondent assignment" let messageFragment = correspondent ? `assign the correspondent ${correspondent.name} to` : `remove all correspondents from` @@ -161,10 +158,7 @@ export class DocumentListComponent implements OnInit { }) } - bulkSetDocumentType(documentType: PaperlessDocumentType[]) { - if (documentType.length > 0) documentType = documentType.shift() - else documentType = undefined - + bulkSetDocumentType(documentType: PaperlessDocumentType) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Document Type assignment" let messageFragment = documentType ? `assign the document type ${documentType.name} to` : `remove all document types from` @@ -182,7 +176,7 @@ export class DocumentListComponent implements OnInit { bulkSetTags(tags) { console.log('bulkSetTags', tags); - // TODO: + // TODO: } bulkAddTag() { From d91fa99e779366c3c892be80cb0213070787525a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 14:26:26 -0800 Subject: [PATCH 14/92] Handler for bulk set tags (awaiting API endpoint) --- .../document-list/document-list.component.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index a08cb1fad..3bdbc3eb8 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -174,9 +174,21 @@ export class DocumentListComponent implements OnInit { }) } - bulkSetTags(tags) { - console.log('bulkSetTags', tags); - // TODO: + bulkSetTags(tags: PaperlessTag[]) { + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) + modal.componentInstance.title = "Confirm Tags assignment" + let messageFragment = tags ? `assign the tag(s) ${tags.map(t => t.name).join(', ')} to` : `remove all tags from` + modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` + modal.componentInstance.btnClass = "btn-warning" + modal.componentInstance.btnCaption = "Confirm" + modal.componentInstance.confirmClicked.subscribe(() => { + // TODO: API endpoint for set multiple tags + this.executeBulkOperation('set_tags', {"document_type": tags ? tags.map(t => t.id) : null}).subscribe( + response => { + modal.close() + } + ) + }) } bulkAddTag() { From 561db8607a91099a85d690f5572af9b5f48beef5 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 15:20:07 -0800 Subject: [PATCH 15/92] Unused bulk tag functions --- .../document-list/document-list.component.ts | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 3bdbc3eb8..7e9ce8f66 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -191,38 +191,6 @@ export class DocumentListComponent implements OnInit { }) } - bulkAddTag() { - let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Select tag" - modal.componentInstance.message = `Select the tag you wish to assign to ${this.list.selected.size} selected document(s):` - this.tagService.listAll().subscribe(response => { - modal.componentInstance.objects = response.results - }) - modal.componentInstance.selectClicked.subscribe(selectedId => { - this.executeBulkOperation('add_tag', {"tag": selectedId}).subscribe( - response => { - modal.close() - } - ) - }) - } - - bulkRemoveTag() { - let modal = this.modalService.open(SelectDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Select tag" - modal.componentInstance.message = `Select the tag you wish to remove from ${this.list.selected.size} selected document(s):` - this.tagService.listAll().subscribe(response => { - modal.componentInstance.objects = response.results - }) - modal.componentInstance.selectClicked.subscribe(selectedId => { - this.executeBulkOperation('remove_tag', {"tag": selectedId}).subscribe( - response => { - modal.close() - } - ) - }) - } - bulkDelete() { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.delayConfirm(5) From 9a4190bedfd8fc7747c13aa988fecbd323ac2ab0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 20:19:37 -0800 Subject: [PATCH 16/92] Rename dropdown type enum & add pass as variable to use like an Enum --- .../filterable-dropdown/filterable-dropdown.component.html | 4 ++-- .../filterable-dropdown/filterable-dropdown.component.ts | 6 ++++-- .../document-list/bulk-editor/bulk-editor.component.html | 6 +++--- .../document-list/bulk-editor/bulk-editor.component.ts | 3 ++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 870ea41e4..425a290a5 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -1,12 +1,12 @@
-
-
- - +
+ +
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 2d224567f..76b588be5 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -6,12 +6,12 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { FilterPipe } from 'src/app/pipes/filter.pipe'; import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' -export interface SelectableItem { +export interface ToggleableItem { item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent, - state: SelectableItemState + state: ToggleableItemState } -export enum SelectableItemState { +export enum ToggleableItemState { NotSelected = 0, Selected = 1, PartiallySelected = 2 @@ -37,33 +37,33 @@ export class FilterableDropdownComponent { @Input() set items(items: ObjectWithId[]) { if (items) { - this._selectableItems = items.map(i => { - return {item: i, state: SelectableItemState.NotSelected} + this._toggleableItems = items.map(i => { + return {item: i, state: ToggleableItemState.NotSelected} }) } } - _selectableItems: SelectableItem[] = [] + _toggleableItems: ToggleableItem[] = [] @Input() - set selectableItems (selectableItems: SelectableItem[]) { + set toggleableItems (toggleableItems: ToggleableItem[]) { if (this.type == FilterableDropdownType.Editing && this.dropdown?.isOpen()) return - else this._selectableItems = selectableItems + else this._toggleableItems = toggleableItems } - get selectableItems(): SelectableItem[] { - return this._selectableItems + get toggleableItems(): ToggleableItem[] { + return this._toggleableItems } @Input() set itemsSelected(itemsSelected: ObjectWithId[]) { - this.selectableItems.forEach(i => { - i.state = (itemsSelected.find(is => is.id == i.item.id)) ? SelectableItemState.Selected : SelectableItemState.NotSelected + this.toggleableItems.forEach(i => { + i.state = (itemsSelected.find(is => is.id == i.item.id)) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected }) } get itemsSelected() :ObjectWithId[] { - return this.selectableItems.filter(si => si.state == SelectableItemState.Selected).map(si => si.item) + return this.toggleableItems.filter(si => si.state == ToggleableItemState.Selected).map(si => si.item) } @Input() @@ -91,11 +91,11 @@ export class FilterableDropdownComponent { constructor(private filterPipe: FilterPipe) { } - toggleItem(selectableItem: SelectableItem): void { - if (this.singular && selectableItem.state == SelectableItemState.Selected) { - this._selectableItems.filter(si => si.item.id !== selectableItem.item.id).forEach(si => si.state = SelectableItemState.NotSelected) + toggleItem(toggleableItem: ToggleableItem): void { + if (this.singular && toggleableItem.state == ToggleableItemState.Selected) { + this._toggleableItems.filter(si => si.item.id !== toggleableItem.item.id).forEach(si => si.state = ToggleableItemState.NotSelected) } - this.toggle.emit(selectableItem.item) + this.toggle.emit(toggleableItem.item) } dropdownOpenChange(open: boolean): void { @@ -111,7 +111,7 @@ export class FilterableDropdownComponent { } listFilterEnter(): void { - let filtered = this.filterPipe.transform(this.selectableItems, this.filterText) + let filtered = this.filterPipe.transform(this.toggleableItems, this.filterText) if (filtered.length == 1) this.toggleItem(filtered.shift()) this.dropdown.close() } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 4f79a6c3e..58ca5e5a7 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -26,9 +26,9 @@
- - - + + +
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 7ba134e15..2e6edbb71 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -8,7 +8,7 @@ import { TagService } from 'src/app/services/rest/tag.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { DocumentService } from 'src/app/services/rest/document.service'; -import { SelectableItem, SelectableItemState, FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; +import { ToggleableItem, ToggleableItemState, FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; @Component({ selector: 'app-bulk-editor', @@ -48,51 +48,51 @@ export class BulkEditorComponent { correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] - private initiallySelectedTagsSelectableItems: SelectableItem[] - private initiallySelectedCorrespondentsSelectableItems: SelectableItem[] - private initiallySelectedDocumentTypesSelectableItems: SelectableItem[] + private initiallySelectedTagsToggleableItems: ToggleableItem[] + private initiallySelectedCorrespondentsToggleableItems: ToggleableItem[] + private initiallySelectedDocumentTypesToggleableItems: ToggleableItem[] dropdownTypes = FilterableDropdownType - get tagsSelectableItems(): SelectableItem[] { - let tagsSelectableItems = [] + get tagsToggleableItems(): ToggleableItem[] { + let tagsToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) this.tags.forEach(t => { let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id)) - let state = SelectableItemState.NotSelected - if (selectedDocumentsWithTag.length == selectedDocuments.length) state = SelectableItemState.Selected - else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected - tagsSelectableItems.push( { item: t, state: state } ) + let state = ToggleableItemState.NotSelected + if (selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected + else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected + tagsToggleableItems.push( { item: t, state: state } ) }) - return tagsSelectableItems + return tagsToggleableItems } - get correspondentsSelectableItems(): SelectableItem[] { - let correspondentsSelectableItems = [] + get correspondentsToggleableItems(): ToggleableItem[] { + let correspondentsToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) this.correspondents.forEach(c => { let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id) - let state = SelectableItemState.NotSelected - if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = SelectableItemState.Selected - else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected - correspondentsSelectableItems.push( { item: c, state: state } ) + let state = ToggleableItemState.NotSelected + if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected + else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected + correspondentsToggleableItems.push( { item: c, state: state } ) }) - return correspondentsSelectableItems + return correspondentsToggleableItems } - get documentTypesSelectableItems(): SelectableItem[] { - let documentTypesSelectableItems = [] + get documentTypesToggleableItems(): ToggleableItem[] { + let documentTypesToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) this.documentTypes.forEach(dt => { let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id) - let state = SelectableItemState.NotSelected - if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = SelectableItemState.Selected - else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = SelectableItemState.PartiallySelected - documentTypesSelectableItems.push( { item: dt, state: state } ) + let state = ToggleableItemState.NotSelected + if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected + else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected + documentTypesToggleableItems.push( { item: dt, state: state } ) }) - return documentTypesSelectableItems + return documentTypesToggleableItems } constructor( @@ -109,39 +109,39 @@ export class BulkEditorComponent { } tagsDropdownOpen() { - this.initiallySelectedTagsSelectableItems = this.tagsSelectableItems.filter(tsi => tsi.state == SelectableItemState.Selected) + this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tsi => tsi.state == ToggleableItemState.Selected) } correspondentsDropdownOpen() { - this.initiallySelectedCorrespondentsSelectableItems = this.correspondentsSelectableItems.filter(csi => csi.state == SelectableItemState.Selected) + this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(csi => csi.state == ToggleableItemState.Selected) } documentTypesDropdownOpen() { - this.initiallySelectedDocumentTypesSelectableItems = this.documentTypesSelectableItems.filter(dtsi => dtsi.state == SelectableItemState.Selected) + this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtsi => dtsi.state == ToggleableItemState.Selected) } applyTags(selectedTags: PaperlessTag[]) { - let unchanged = this.equateItemsToSelectableItems(selectedTags, this.initiallySelectedTagsSelectableItems) + let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems) if (!unchanged) this.setTags.emit(selectedTags) - this.initiallySelectedTagsSelectableItems = null + this.initiallySelectedTagsToggleableItems = null } applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) { - let unchanged = this.equateItemsToSelectableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsSelectableItems) + let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems) if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null) - this.initiallySelectedCorrespondentsSelectableItems = null + this.initiallySelectedCorrespondentsToggleableItems = null } applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) { - let unchanged = this.equateItemsToSelectableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesSelectableItems) + let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems) if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null) - this.initiallySelectedDocumentTypesSelectableItems = null + this.initiallySelectedDocumentTypesToggleableItems = null } - equateItemsToSelectableItems(items: ObjectWithId[], selectableItems: SelectableItem[]): boolean { - // either both empty or all items must in selectableItems and vice-versa - return (selectableItems.length == 0 && items.length == 0) || - (items.every(i => selectableItems.find(si => si.item.id == i.id) !== undefined) && selectableItems.every(si => items.find(i => i.id == si.item.id) !== undefined)) + equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean { + // either both empty or all items must in toggleableItems and vice-versa + return (toggleableItems.length == 0 && items.length == 0) || + (items.every(i => toggleableItems.find(si => si.item.id == i.id) !== undefined) && toggleableItems.every(si => items.find(i => i.id == si.item.id) !== undefined)) } applyDelete() { diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts index 51d1924b8..1ea10c56e 100644 --- a/src-ui/src/app/pipes/filter.pipe.ts +++ b/src-ui/src/app/pipes/filter.pipe.ts @@ -1,17 +1,17 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { SelectableItem } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; +import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; @Pipe({ name: 'filter' }) export class FilterPipe implements PipeTransform { - transform(selectableItems: SelectableItem[], searchText: string): any[] { - if (!selectableItems) return []; - if (!searchText) return selectableItems; + transform(toggleableItems: ToggleableItem[], searchText: string): any[] { + if (!toggleableItems) return []; + if (!searchText) return toggleableItems; - return selectableItems.filter(selectableItem => { - return Object.keys(selectableItem.item).some(key => { - return String(selectableItem.item[key]).toLowerCase().includes(searchText.toLowerCase()); + return toggleableItems.filter(toggleableItem => { + return Object.keys(toggleableItem.item).some(key => { + return String(toggleableItem.item[key]).toLowerCase().includes(searchText.toLowerCase()); }); }); } From de6ba3489a929408c1fae41fd2a6a44547299979 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 21:56:31 -0800 Subject: [PATCH 20/92] Cleanup dropdown button component --- .../filterable-dropdown-button.component.html | 6 +++--- .../filterable-dropdown-button.component.ts | 12 +++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html index 5b58025d1..75dadba53 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html @@ -5,8 +5,8 @@
- - {{item.name}} + + {{toggleableItem?.item.name}}
-
{{item.document_count}}
+
{{toggleableItem?.item.document_count}}
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts index b0ced21cc..3486bdb46 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts @@ -9,22 +9,16 @@ import { ToggleableItem, ToggleableItemState } from '../filterable-dropdown.comp templateUrl: './filterable-dropdown-button.component.html', styleUrls: ['./filterable-dropdown-button.component.scss'] }) -export class FilterableDropdownButtonComponent implements OnInit { +export class FilterableDropdownButtonComponent { @Input() toggleableItem: ToggleableItem - get item(): PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent { - return this.toggleableItem?.item - } - @Output() toggle = new EventEmitter() - isTag: boolean - - ngOnInit() { - this.isTag = 'is_inbox_tag' in this.item // ~ this.item instanceof PaperlessTag + get isTag(): boolean { + return 'is_inbox_tag' in this.toggleableItem?.item // ~ this.item instanceof PaperlessTag } toggleItem(): void { From ee4e026ba2c882c5b4d5f3b3985c25d0f7fd7277 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 22:06:17 -0800 Subject: [PATCH 21/92] rework toolbar --- .../bulk-editor/bulk-editor.component.html | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 58ca5e5a7..746dd9569 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1,5 +1,13 @@
-
+
+ +
+
-
-
+
- +
-
-
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 76b588be5..dc1139783 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -5,17 +5,7 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { FilterPipe } from 'src/app/pipes/filter.pipe'; import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' - -export interface ToggleableItem { - item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent, - state: ToggleableItemState -} - -export enum ToggleableItemState { - NotSelected = 0, - Selected = 1, - PartiallySelected = 2 -} +import { ToggleableItem, ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component'; export enum FilterableDropdownType { Filtering = 'filtering', diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html similarity index 100% rename from src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.html rename to src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.scss b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.scss similarity index 100% rename from src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.scss rename to src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.scss diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.spec.ts new file mode 100644 index 000000000..ec2868d7c --- /dev/null +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ToggleableDropdownButtonComponent } from './toggleable-dropdown-button.component'; + +describe('ToggleableDropdownButtonComponent', () => { + let component: ToggleableDropdownButtonComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ToggleableDropdownButtonComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ToggleableDropdownButtonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts similarity index 70% rename from src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts rename to src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index 3486bdb46..7c9c02a49 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown-button/filterable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -2,14 +2,24 @@ import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'; import { PaperlessTag } from 'src/app/data/paperless-tag'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; -import { ToggleableItem, ToggleableItemState } from '../filterable-dropdown.component'; + +export interface ToggleableItem { + item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent, + state: ToggleableItemState +} + +export enum ToggleableItemState { + NotSelected = 0, + Selected = 1, + PartiallySelected = 2 +} @Component({ - selector: 'app-filterable-dropdown-button', - templateUrl: './filterable-dropdown-button.component.html', - styleUrls: ['./filterable-dropdown-button.component.scss'] + selector: 'app-toggleable-dropdown-button', + templateUrl: './toggleable-dropdown-button.component.html', + styleUrls: ['./toggleable-dropdown-button.component.scss'] }) -export class FilterableDropdownButtonComponent { +export class ToggleableDropdownButtonComponent { @Input() toggleableItem: ToggleableItem diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 5b9a4ff38..21355fe4c 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -8,7 +8,8 @@ import { TagService } from 'src/app/services/rest/tag.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { DocumentService } from 'src/app/services/rest/document.service'; -import { ToggleableItem, ToggleableItemState, FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; +import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; +import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; @Component({ selector: 'app-bulk-editor', diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts index 1ea10c56e..a982e9019 100644 --- a/src-ui/src/app/pipes/filter.pipe.ts +++ b/src-ui/src/app/pipes/filter.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; +import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; @Pipe({ name: 'filter' From 46f778111c5e555a81f189a84a740f0c190af904 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 22:54:37 -0800 Subject: [PATCH 24/92] Live filter badges when editing & hide badges when active filter items in dropdown --- .../filterable-dropdown.component.html | 2 +- .../filterable-dropdown.component.ts | 13 ++++++++----- .../toggleable-dropdown-button.component.html | 2 +- .../toggleable-dropdown-button.component.ts | 6 +++++- .../bulk-editor/bulk-editor.component.ts | 6 +++--- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 9bc525684..5a05e66b4 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -21,7 +21,7 @@
- +
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index dc1139783..a5dadc603 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -1,5 +1,4 @@ import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core'; -import { ObjectWithId } from 'src/app/data/object-with-id'; import { PaperlessTag } from 'src/app/data/paperless-tag'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; @@ -25,10 +24,10 @@ export class FilterableDropdownComponent { filterText: string @Input() - set items(items: ObjectWithId[]) { + set items(items: (PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[]) { if (items) { this._toggleableItems = items.map(i => { - return {item: i, state: ToggleableItemState.NotSelected} + return {item: i, state: ToggleableItemState.NotSelected, count: i.document_count} }) } } @@ -46,13 +45,13 @@ export class FilterableDropdownComponent { } @Input() - set itemsSelected(itemsSelected: ObjectWithId[]) { + set itemsSelected(itemsSelected: (PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[]) { this.toggleableItems.forEach(i => { i.state = (itemsSelected.find(is => is.id == i.item.id)) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected }) } - get itemsSelected() :ObjectWithId[] { + get itemsSelected() :(PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[] { return this.toggleableItems.filter(si => si.state == ToggleableItemState.Selected).map(si => si.item) } @@ -79,6 +78,10 @@ export class FilterableDropdownComponent { @Output() editingComplete = new EventEmitter() + get showCounts(): boolean { + return this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected == 0) + } + constructor(private filterPipe: FilterPipe) { } toggleItem(toggleableItem: ToggleableItem): void { diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html index 75dadba53..32f9c58ad 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html @@ -8,5 +8,5 @@ {{toggleableItem?.item.name}}
-
{{toggleableItem?.item.document_count}}
+
{{toggleableItem?.count}}
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index 7c9c02a49..4d58023ad 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -5,7 +5,8 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; export interface ToggleableItem { item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent, - state: ToggleableItemState + state: ToggleableItemState, + count: number } export enum ToggleableItemState { @@ -24,6 +25,9 @@ export class ToggleableDropdownButtonComponent { @Input() toggleableItem: ToggleableItem + @Input() + showCounts: boolean = true + @Output() toggle = new EventEmitter() diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 21355fe4c..af6934e32 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -63,7 +63,7 @@ export class BulkEditorComponent { let state = ToggleableItemState.NotSelected if (selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - tagsToggleableItems.push( { item: t, state: state } ) + tagsToggleableItems.push( { item: t, state: state, count: selectedDocumentsWithTag.length } ) }) return tagsToggleableItems } @@ -77,7 +77,7 @@ export class BulkEditorComponent { let state = ToggleableItemState.NotSelected if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - correspondentsToggleableItems.push( { item: c, state: state } ) + correspondentsToggleableItems.push( { item: c, state: state, count: selectedDocumentsWithCorrespondent.length } ) }) return correspondentsToggleableItems } @@ -91,7 +91,7 @@ export class BulkEditorComponent { let state = ToggleableItemState.NotSelected if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - documentTypesToggleableItems.push( { item: dt, state: state } ) + documentTypesToggleableItems.push( { item: dt, state: state, count: selectedDocumentsWithDocumentType.length } ) }) return documentTypesToggleableItems } From 86da578774b62d638dd55e32e8b88dc954d83346 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 23:42:08 -0800 Subject: [PATCH 25/92] Hide toggled state & counts when selection spans documents not in view --- .../filterable-dropdown.component.ts | 9 ++++- .../bulk-editor/bulk-editor.component.html | 6 ++-- .../bulk-editor/bulk-editor.component.ts | 36 +++++++++++-------- .../document-list.component.html | 2 +- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index a5dadc603..9a2c3cfc0 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -78,8 +78,15 @@ export class FilterableDropdownComponent { @Output() editingComplete = new EventEmitter() + _showCounts: boolean = true + + @Input + set showCounts(show: boolean) { + this._showCounts = show + } + get showCounts(): boolean { - return this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected == 0) + return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected == 0)) } constructor(private filterPipe: FilterPipe) { } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 746dd9569..77d171656 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -28,9 +28,9 @@
- - - + + +
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index af6934e32..c8c05a327 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -22,7 +22,7 @@ export class BulkEditorComponent { selectedDocuments: Set @Input() - allDocuments: PaperlessDocument[] + viewDocuments: PaperlessDocument[] @Output() selectPage = new EventEmitter() @@ -45,53 +45,61 @@ export class BulkEditorComponent { @Output() delete = new EventEmitter() - tags: PaperlessTag[] - correspondents: PaperlessCorrespondent[] - documentTypes: PaperlessDocumentType[] + private tags: PaperlessTag[] + private correspondents: PaperlessCorrespondent[] + private documentTypes: PaperlessDocumentType[] private initiallySelectedTagsToggleableItems: ToggleableItem[] private initiallySelectedCorrespondentsToggleableItems: ToggleableItem[] private initiallySelectedDocumentTypesToggleableItems: ToggleableItem[] - dropdownTypes = FilterableDropdownType + private dropdownTypes = FilterableDropdownType + + get selectionSpansPages(): boolean { + return this.selectedDocuments.length > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd)) + } get tagsToggleableItems(): ToggleableItem[] { let tagsToggleableItems = [] - let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) + let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id)) + if (this.selectionSpansPages) selectedDocuments = [] + this.tags?.forEach(t => { let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id)) let state = ToggleableItemState.NotSelected - if (selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected + if (selectedDocuments.length > 0 && selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - tagsToggleableItems.push( { item: t, state: state, count: selectedDocumentsWithTag.length } ) + tagsToggleableItems.push({item: t, state: state, count: selectedDocumentsWithTag.length}) }) return tagsToggleableItems } get correspondentsToggleableItems(): ToggleableItem[] { let correspondentsToggleableItems = [] - let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) + let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id)) + if (this.selectionSpansPages) selectedDocuments = [] this.correspondents?.forEach(c => { let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id) let state = ToggleableItemState.NotSelected - if (selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected + if (selectedDocuments.length > 0 && selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - correspondentsToggleableItems.push( { item: c, state: state, count: selectedDocumentsWithCorrespondent.length } ) + correspondentsToggleableItems.push({item: c, state: state, count: selectedDocumentsWithCorrespondent.length}) }) return correspondentsToggleableItems } get documentTypesToggleableItems(): ToggleableItem[] { let documentTypesToggleableItems = [] - let selectedDocuments: PaperlessDocument[] = this.allDocuments.filter(d => this.selectedDocuments.has(d.id)) + let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id)) + if (this.selectionSpansPages) selectedDocuments = [] this.documentTypes?.forEach(dt => { let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id) let state = ToggleableItemState.NotSelected - if (selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected + if (selectedDocuments.length > 0 && selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - documentTypesToggleableItems.push( { item: dt, state: state, count: selectedDocumentsWithDocumentType.length } ) + documentTypesToggleableItems.push({item: dt, state: state, count: selectedDocumentsWithDocumentType.length}) }) return documentTypesToggleableItems } 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 7032325e4..dc1902a24 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 @@ -81,7 +81,7 @@ Date: Sat, 19 Dec 2020 23:44:33 -0800 Subject: [PATCH 26/92] Show 's' when needed instead of (s) on document list --- .../app/components/document-list/document-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dc1902a24..699f13840 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 @@ -94,7 +94,7 @@
-

Selected {{list.selected.size}} of {{list.collectionSize || 0}} document(s) (filtered)

+

Selected {{list.selected.size}} of {{list.collectionSize || 0}} document{{list.collectionSize > 1 ? 's' : ''}} (filtered)

From 7669679fb17555e3dd5785a52ef10bcd28e75e4d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 19 Dec 2020 23:49:20 -0800 Subject: [PATCH 27/92] Mobile fixes --- .../document-list/bulk-editor/bulk-editor.component.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 77d171656..d15b45d0f 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -7,8 +7,9 @@ Cancel +
- +
-
From 3561935e1b8d5906f2a477bbf08d2a47f1dffc48 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 20 Dec 2020 00:12:40 -0800 Subject: [PATCH 28/92] Fix some TS syntax errors --- .../filterable-dropdown.component.ts | 20 +++++++++++-------- .../bulk-editor/bulk-editor.component.ts | 10 +++++----- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 9a2c3cfc0..10713cc00 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -52,7 +52,7 @@ export class FilterableDropdownComponent { } get itemsSelected() :(PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[] { - return this.toggleableItems.filter(si => si.state == ToggleableItemState.Selected).map(si => si.item) + return this.toggleableItems.filter(ti => ti.state == ToggleableItemState.Selected).map(ti => ti.item) } @Input() @@ -67,7 +67,7 @@ export class FilterableDropdownComponent { types = FilterableDropdownType @Input() - singular: boolean = false + tingular: boolean = false @Output() toggle = new EventEmitter() @@ -80,20 +80,20 @@ export class FilterableDropdownComponent { _showCounts: boolean = true - @Input + @Input() set showCounts(show: boolean) { this._showCounts = show } get showCounts(): boolean { - return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected == 0)) + return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected.length == 0)) } constructor(private filterPipe: FilterPipe) { } toggleItem(toggleableItem: ToggleableItem): void { - if (this.singular && toggleableItem.state == ToggleableItemState.Selected) { - this._toggleableItems.filter(si => si.item.id !== toggleableItem.item.id).forEach(si => si.state = ToggleableItemState.NotSelected) + if (this.tingular && toggleableItem.state == ToggleableItemState.Selected) { + this._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected) } this.toggle.emit(toggleableItem.item) } @@ -112,7 +112,11 @@ export class FilterableDropdownComponent { listFilterEnter(): void { let filtered = this.filterPipe.transform(this.toggleableItems, this.filterText) - if (filtered.length == 1) this.toggleItem(filtered.shift()) - this.dropdown.close() + if (filtered.length == 1) { + let toggleableItem = this.toggleableItems.find(ti => ti.item.id == filtered[0].item.id) + if (toggleableItem) toggleableItem.state = ToggleableItemState.Selected + this.toggleItem(filtered[0]) + this.dropdown.close() + } } } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index c8c05a327..66ad265de 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -45,18 +45,18 @@ export class BulkEditorComponent { @Output() delete = new EventEmitter() - private tags: PaperlessTag[] - private correspondents: PaperlessCorrespondent[] - private documentTypes: PaperlessDocumentType[] + tags: PaperlessTag[] + correspondents: PaperlessCorrespondent[] + documentTypes: PaperlessDocumentType[] private initiallySelectedTagsToggleableItems: ToggleableItem[] private initiallySelectedCorrespondentsToggleableItems: ToggleableItem[] private initiallySelectedDocumentTypesToggleableItems: ToggleableItem[] - private dropdownTypes = FilterableDropdownType + dropdownTypes = FilterableDropdownType get selectionSpansPages(): boolean { - return this.selectedDocuments.length > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd)) + return this.selectedDocuments.size > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd)) } get tagsToggleableItems(): ToggleableItem[] { From 37c2051e01d9e171e253c9086e9171b4392f1a0d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 20 Dec 2020 00:37:37 -0800 Subject: [PATCH 29/92] Typos & code fixes --- .../filterable-dropdown.component.ts | 4 ++-- .../bulk-editor/bulk-editor.component.ts | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 10713cc00..bec6e1bef 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -67,7 +67,7 @@ export class FilterableDropdownComponent { types = FilterableDropdownType @Input() - tingular: boolean = false + singular: boolean = false @Output() toggle = new EventEmitter() @@ -92,7 +92,7 @@ export class FilterableDropdownComponent { constructor(private filterPipe: FilterPipe) { } toggleItem(toggleableItem: ToggleableItem): void { - if (this.tingular && toggleableItem.state == ToggleableItemState.Selected) { + if (this.singular && toggleableItem.state == ToggleableItemState.Selected) { this._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected) } this.toggle.emit(toggleableItem.item) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 66ad265de..053af8157 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -118,39 +118,39 @@ export class BulkEditorComponent { } tagsDropdownOpen() { - this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tsi => tsi.state == ToggleableItemState.Selected) + this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tti => tti.state == ToggleableItemState.Selected) } correspondentsDropdownOpen() { - this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(csi => csi.state == ToggleableItemState.Selected) + this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(cti => cti.state == ToggleableItemState.Selected) } documentTypesDropdownOpen() { - this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtsi => dtsi.state == ToggleableItemState.Selected) + this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtti => dtti.state == ToggleableItemState.Selected) } applyTags(selectedTags: PaperlessTag[]) { let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems) if (!unchanged) this.setTags.emit(selectedTags) - this.initiallySelectedTagsToggleableItems = null + this.initiallySelectedTagsToggleableItems = [] } applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) { let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems) if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null) - this.initiallySelectedCorrespondentsToggleableItems = null + this.initiallySelectedCorrespondentsToggleableItems = [] } applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) { let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems) if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null) - this.initiallySelectedDocumentTypesToggleableItems = null + this.initiallySelectedDocumentTypesToggleableItems = [] } equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean { // either both empty or all items must in toggleableItems and vice-versa return (toggleableItems.length == 0 && items.length == 0) || - (items.every(i => toggleableItems.find(si => si.item.id == i.id) !== undefined) && toggleableItems.every(si => items.find(i => i.id == si.item.id) !== undefined)) + (items.every(i => toggleableItems.find(ti => ti.item.id == i.id) !== undefined) && toggleableItems.every(ti => items.find(i => i.id == ti.item.id) !== undefined)) } applyDelete() { From fa7b90a5846fdc94ecdbc51380a50f7589c8c28a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 20 Dec 2020 01:04:54 -0800 Subject: [PATCH 30/92] Add apply button to dropdowns --- .../filterable-dropdown/filterable-dropdown.component.html | 6 ++++++ .../filterable-dropdown/filterable-dropdown.component.ts | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 5a05e66b4..58c831456 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -24,6 +24,12 @@ + diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index bec6e1bef..05c77cd10 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -89,12 +89,15 @@ export class FilterableDropdownComponent { return this._showCounts && (this.type == FilterableDropdownType.Editing || (this.type == FilterableDropdownType.Filtering && this.itemsSelected.length == 0)) } + hasBeenToggled:boolean = false + constructor(private filterPipe: FilterPipe) { } toggleItem(toggleableItem: ToggleableItem): void { if (this.singular && toggleableItem.state == ToggleableItemState.Selected) { this._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected) } + this.hasBeenToggled = true this.toggle.emit(toggleableItem.item) } @@ -103,6 +106,7 @@ export class FilterableDropdownComponent { setTimeout(() => { this.listFilterTextInput.nativeElement.focus(); }, 0) + this.hasBeenToggled = false this.open.next() } else { this.filterText = '' From d9e3895f3470c2da1c56e2711e3767a8e2451d6d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 20 Dec 2020 08:07:19 -0800 Subject: [PATCH 31/92] Fix 2px difference between two editors =) --- .../document-list/bulk-editor/bulk-editor.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index d15b45d0f..35b6d5197 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -9,7 +9,7 @@
- +
Name{{ tag.document_count }}
- - + + +
-
+
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts index 29a8f3af6..19f8b27f9 100644 --- a/src-ui/src/environments/environment.ts +++ b/src-ui/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiBaseUrl: "http://localhost:8000/api/", + apiBaseUrl: "http://10.0.1.28:8000/api/", appTitle: "Paperless-ng", version: "DEVELOPMENT" }; From dcbc0ea2e5d360001e02b2a1f1f0fccb703f237e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Mon, 21 Dec 2020 09:52:55 -0800 Subject: [PATCH 33/92] Revert "Fix list small card layout" This reverts commit 0e93f7eba577815ea251262dba6be5ac43558b4b. --- src-ui/angular.json | 259 +++++++++--------- .../document-list.component.html | 2 +- src-ui/src/environments/environment.ts | 2 +- 3 files changed, 130 insertions(+), 133 deletions(-) diff --git a/src-ui/angular.json b/src-ui/angular.json index 179053958..2ff1bb3b0 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -1,133 +1,130 @@ { - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "projects": { - "paperless-ui": { - "projectType": "application", - "schematics": { - "@schematics/angular:component": { - "style": "scss" - } - }, - "root": "", - "sourceRoot": "src", - "prefix": "app", - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "dist/paperless-ui", - "outputHashing": "none", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.app.json", - "aot": true, - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], - "scripts": [] - }, - "configurations": { - "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "optimization": true, - "outputHashing": "none", - "sourceMap": false, - "extractCss": true, - "namedChunks": false, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, - "budgets": [ - { - "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "6kb", - "maximumError": "10kb" - } - ] - } - } - }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "options": { - "browserTarget": "paperless-ui:build" - }, - "configurations": { - "production": { - "browserTarget": "paperless-ui:build:production" - } - } - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", - "options": { - "browserTarget": "paperless-ui:build" - } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.spec.json", - "karmaConfig": "karma.conf.js", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], - "scripts": [] - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "tsconfig.app.json", - "tsconfig.spec.json", - "e2e/tsconfig.json" - ], - "exclude": [ - "**/node_modules/**" - ] - } - }, - "e2e": { - "builder": "@angular-devkit/build-angular:protractor", - "options": { - "protractorConfig": "e2e/protractor.conf.js", - "devServerTarget": "paperless-ui:serve" - }, - "configurations": { - "production": { - "devServerTarget": "paperless-ui:serve:production" - } - } - } - } - } - }, - "defaultProject": "paperless-ui", - "cli": { - "analytics": "3204bb5c-281f-49a7-aa58-6656b6967b23" - } + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "paperless-ui": { + "projectType": "application", + "schematics": { + "@schematics/angular:component": { + "style": "scss" + } + }, + "root": "", + "sourceRoot": "src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/paperless-ui", + "outputHashing": "none", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.app.json", + "aot": true, + "assets": [ + "src/favicon.ico", + "src/assets" + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "none", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb", + "maximumError": "10kb" + } + ] + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "paperless-ui:build" + }, + "configurations": { + "production": { + "browserTarget": "paperless-ui:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "paperless-ui:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.spec.json", + "karmaConfig": "karma.conf.js", + "assets": [ + "src/favicon.ico", + "src/assets" + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [] + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "tsconfig.app.json", + "tsconfig.spec.json", + "e2e/tsconfig.json" + ], + "exclude": [ + "**/node_modules/**" + ] + } + }, + "e2e": { + "builder": "@angular-devkit/build-angular:protractor", + "options": { + "protractorConfig": "e2e/protractor.conf.js", + "devServerTarget": "paperless-ui:serve" + }, + "configurations": { + "production": { + "devServerTarget": "paperless-ui:serve:production" + } + } + } + } + } + }, + "defaultProject": "paperless-ui" } \ No newline at end of file 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 31a2efd0d..5ce4efd2a 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 @@ -150,6 +150,6 @@ -
+
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts index 19f8b27f9..29a8f3af6 100644 --- a/src-ui/src/environments/environment.ts +++ b/src-ui/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiBaseUrl: "http://10.0.1.28:8000/api/", + apiBaseUrl: "http://localhost:8000/api/", appTitle: "Paperless-ng", version: "DEVELOPMENT" }; From 29e9d7d79364e4ebb11daa63b59ce616a1d00796 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Mon, 21 Dec 2020 09:53:43 -0800 Subject: [PATCH 34/92] Some changes from #141 were lost --- .../app/components/document-list/document-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5ce4efd2a..1898a4849 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 @@ -150,6 +150,6 @@ -
+
From 48d83e166b2924856e441349b126402053d0dcff Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Mon, 21 Dec 2020 11:12:48 -0800 Subject: [PATCH 35/92] use ngIf for editor components to maybe help performance --- .../document-list/document-list.component.html | 4 ++-- .../document-list/document-list.component.ts | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 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 1898a4849..970d41ec4 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 @@ -78,9 +78,9 @@
- + - { + this.filterEditor.toggleTag(tagID) + }) } clickCorrespondent(correspondentID: number) { this.list.selectNone() - this.filterEditor.toggleCorrespondent(correspondentID) + setTimeout(() => { + this.filterEditor.toggleCorrespondent(correspondentID) + }) } clickDocumentType(documentTypeID: number) { this.list.selectNone() - this.filterEditor.toggleDocumentType(documentTypeID) + setTimeout(() => { + this.filterEditor.toggleDocumentType(documentTypeID) + }) } private executeBulkOperation(method: string, args): Observable { From 360fc081bb8ba36f6d81cc6e9f2ec110644d6ca3 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 22 Dec 2020 02:08:36 -0800 Subject: [PATCH 36/92] Completely rewrite change detection, add back remove operations --- .../filterable-dropdown.component.html | 6 ++ .../filterable-dropdown.component.ts | 8 +- .../bulk-editor/bulk-editor.component.html | 30 +++++++- .../bulk-editor/bulk-editor.component.ts | 74 +++++++++++++------ .../document-list.component.html | 3 + .../document-list/document-list.component.ts | 52 ++++++++++++- 6 files changed, 143 insertions(+), 30 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 58c831456..f9bf78b6c 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -19,6 +19,12 @@
+
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 05c77cd10..3f0b3c3ad 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -69,12 +69,18 @@ export class FilterableDropdownComponent { @Input() singular: boolean = false + @Input() + showRemoveAll: boolean = false + @Output() toggle = new EventEmitter() @Output() open = new EventEmitter() + @Output() + removeAll = new EventEmitter() + @Output() editingComplete = new EventEmitter() @@ -110,7 +116,7 @@ export class FilterableDropdownComponent { this.open.next() } else { this.filterText = '' - if (this.type == FilterableDropdownType.Editing) this.editingComplete.emit(this.itemsSelected) + if (this.type == FilterableDropdownType.Editing) this.editingComplete.emit(this.toggleableItems) } } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 35b6d5197..589739d78 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -29,9 +29,33 @@
- - - + + + + + +
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 053af8157..31f7b5566 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -11,6 +11,11 @@ import { DocumentService } from 'src/app/services/rest/document.service'; import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; +interface ChangedItems { + itemsToAdd: any[], + itemsToRemove: any[] +} + @Component({ selector: 'app-bulk-editor', templateUrl: './bulk-editor.component.html', @@ -33,6 +38,9 @@ export class BulkEditorComponent { @Output() selectNone = new EventEmitter() + @Output() + setTags = new EventEmitter() + @Output() setCorrespondent = new EventEmitter() @@ -40,18 +48,24 @@ export class BulkEditorComponent { setDocumentType = new EventEmitter() @Output() - setTags = new EventEmitter() + delete = new EventEmitter() @Output() - delete = new EventEmitter() + removeTags = new EventEmitter() + + @Output() + removeCorrespondents = new EventEmitter() + + @Output() + removeDocumentTypes = new EventEmitter() tags: PaperlessTag[] correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] - private initiallySelectedTagsToggleableItems: ToggleableItem[] - private initiallySelectedCorrespondentsToggleableItems: ToggleableItem[] - private initiallySelectedDocumentTypesToggleableItems: ToggleableItem[] + private initialTagsToggleableItems: ToggleableItem[] + private initialCorrespondentsToggleableItems: ToggleableItem[] + private initialDocumentTypesToggleableItems: ToggleableItem[] dropdownTypes = FilterableDropdownType @@ -59,6 +73,7 @@ export class BulkEditorComponent { return this.selectedDocuments.size > this.viewDocuments.length || !Array.from(this.selectedDocuments).every(sd => this.viewDocuments.find(d => d.id == sd)) } + private _tagsToggleableItems: ToggleableItem[] get tagsToggleableItems(): ToggleableItem[] { let tagsToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id)) @@ -71,9 +86,11 @@ export class BulkEditorComponent { else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected tagsToggleableItems.push({item: t, state: state, count: selectedDocumentsWithTag.length}) }) + this._tagsToggleableItems = tagsToggleableItems return tagsToggleableItems } + private _correspondentsToggleableItems: ToggleableItem[] get correspondentsToggleableItems(): ToggleableItem[] { let correspondentsToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id)) @@ -86,9 +103,11 @@ export class BulkEditorComponent { else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected correspondentsToggleableItems.push({item: c, state: state, count: selectedDocumentsWithCorrespondent.length}) }) + this._correspondentsToggleableItems = correspondentsToggleableItems return correspondentsToggleableItems } + private _documentTypesToggleableItems: ToggleableItem[] get documentTypesToggleableItems(): ToggleableItem[] { let documentTypesToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.viewDocuments.filter(d => this.selectedDocuments.has(d.id)) @@ -101,6 +120,7 @@ export class BulkEditorComponent { else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected documentTypesToggleableItems.push({item: dt, state: state, count: selectedDocumentsWithDocumentType.length}) }) + this._documentTypesToggleableItems = documentTypesToggleableItems return documentTypesToggleableItems } @@ -118,39 +138,45 @@ export class BulkEditorComponent { } tagsDropdownOpen() { - this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tti => tti.state == ToggleableItemState.Selected) + this.initialTagsToggleableItems = this._tagsToggleableItems } correspondentsDropdownOpen() { - this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(cti => cti.state == ToggleableItemState.Selected) + this.initialCorrespondentsToggleableItems = this._correspondentsToggleableItems } documentTypesDropdownOpen() { - this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtti => dtti.state == ToggleableItemState.Selected) + this.initialDocumentTypesToggleableItems = this._documentTypesToggleableItems } - applyTags(selectedTags: PaperlessTag[]) { - let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems) - if (!unchanged) this.setTags.emit(selectedTags) - this.initiallySelectedTagsToggleableItems = [] + applyTags(newTagsToggleableItems: ToggleableItem[], forceApply:boolean = false) { + let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems) + if (changedTags.itemsToAdd.length > 0) this.setTags.emit(changedTags.itemsToAdd) + if (changedTags.itemsToRemove.length > 0) this.removeTags.emit(changedTags.itemsToRemove) } - applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) { - let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems) - if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null) - this.initiallySelectedCorrespondentsToggleableItems = [] + applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[], forceApply:boolean = false) { + let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems) + if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd) + else if (changedCorrespondents.itemsToRemove.length > 0) this.removeCorrespondents.emit(changedCorrespondents.itemsToRemove) } - applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) { - let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems) - if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null) - this.initiallySelectedDocumentTypesToggleableItems = [] + applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[], forceApply:boolean = false) { + let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems) + if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd) + else if (changedDocumentTypes.itemsToRemove.length > 0) this.removeDocumentTypes.emit(changedDocumentTypes.itemsToRemove) } - equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean { - // either both empty or all items must in toggleableItems and vice-versa - return (toggleableItems.length == 0 && items.length == 0) || - (items.every(i => toggleableItems.find(ti => ti.item.id == i.id) !== undefined) && toggleableItems.every(ti => items.find(i => i.id == ti.item.id) !== undefined)) + checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems { + let itemsToAdd: any[] = [] + let itemsToRemove: any[] = [] + toggleableItemsA.forEach(oldItem => { + let newItem = toggleableItemsB.find(nTTI => nTTI.item.id == oldItem.item.id) + + if (newItem.state == ToggleableItemState.Selected && (oldItem.state == ToggleableItemState.PartiallySelected || oldItem.state == ToggleableItemState.NotSelected)) itemsToAdd.push(newItem.item) + else if (newItem.state == ToggleableItemState.NotSelected && (oldItem.state == ToggleableItemState.Selected || oldItem.state == ToggleableItemState.PartiallySelected)) itemsToRemove.push(newItem.item) + }) + return { itemsToAdd: itemsToAdd, itemsToRemove: itemsToRemove } } applyDelete() { 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 36c6daa5b..d685e6770 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 @@ -87,8 +87,11 @@ (selectAll)="list.selectAll()" (selectNone)="list.selectNone()" (setTags)="bulkSetTags($event)" + (removeTags)="bulkRemoveTags($event)" (setCorrespondent)="bulkSetCorrespondent($event)" + (removeCorrespondents)="bulkRemoveCorrespondents($event)" (setDocumentType)="bulkSetDocumentType($event)" + (removeDocumentTypes)="bulkRemoveDocumentTypes($event)" (delete)="bulkDelete()">
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 2575e4b49..60d763f13 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -158,7 +158,7 @@ export class DocumentListComponent implements OnInit { bulkSetCorrespondent(correspondent: PaperlessCorrespondent) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Confirm correspondent assignment" + modal.componentInstance.title = "Confirm Correspondent assignment" let messageFragment = correspondent ? `assign the correspondent ${correspondent.name} to` : `remove all correspondents from` modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` modal.componentInstance.btnClass = "btn-warning" @@ -172,6 +172,22 @@ export class DocumentListComponent implements OnInit { }) } + bulkRemoveCorrespondents(correspondents: PaperlessCorrespondent[]) { + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) + modal.componentInstance.title = "Confirm Correspondent Removal" + modal.componentInstance.message = `This operation will remove the correspondent(s) ${correspondents.map(t => t.name).join(', ')} from all ${this.list.selected.size} selected document(s).` + modal.componentInstance.btnClass = "btn-warning" + modal.componentInstance.btnCaption = "Confirm" + modal.componentInstance.confirmClicked.subscribe(() => { + // TODO: API endpoint for remove multiple correspondents + this.executeBulkOperation('remove_correspondents', {"correspondents": correspondents.map(t => t.id)}).subscribe( + response => { + modal.close() + } + ) + }) + } + bulkSetDocumentType(documentType: PaperlessDocumentType) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Document Type assignment" @@ -188,6 +204,22 @@ export class DocumentListComponent implements OnInit { }) } + bulkRemoveDocumentTypes(documentTypes: PaperlessDocumentType[]) { + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) + modal.componentInstance.title = "Confirm Document Type Removal" + modal.componentInstance.message = `This operation will remove the document type(s) ${documentTypes.map(t => t.name).join(', ')} all ${this.list.selected.size} selected document(s).` + modal.componentInstance.btnClass = "btn-warning" + modal.componentInstance.btnCaption = "Confirm" + modal.componentInstance.confirmClicked.subscribe(() => { + // TODO: API endpoint for remove multiple document types + this.executeBulkOperation('remove_document_types', {"document_types": documentTypes.map(t => t.id)}).subscribe( + response => { + modal.close() + } + ) + }) + } + bulkSetTags(tags: PaperlessTag[]) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Tags assignment" @@ -197,7 +229,23 @@ export class DocumentListComponent implements OnInit { modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { // TODO: API endpoint for set multiple tags - this.executeBulkOperation('set_tags', {"document_type": tags ? tags.map(t => t.id) : null}).subscribe( + this.executeBulkOperation('set_tags', {"tags": tags ? tags.map(t => t.id) : null}).subscribe( + response => { + modal.close() + } + ) + }) + } + + bulkRemoveTags(tags: PaperlessTag[]) { + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) + modal.componentInstance.title = "Confirm Tags Removal" + modal.componentInstance.message = `This operation will remove the tags ${tags.map(t => t.name).join(', ')} from all ${this.list.selected.size} selected document(s).` + modal.componentInstance.btnClass = "btn-warning" + modal.componentInstance.btnCaption = "Confirm" + modal.componentInstance.confirmClicked.subscribe(() => { + // TODO: API endpoint for remove multiple tags + this.executeBulkOperation('remove_tags', {"tags": tags.map(t => t.id)}).subscribe( response => { modal.close() } From 2f26d0748045571575c7716dfaed48f31f675f2f Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 22 Dec 2020 02:14:37 -0800 Subject: [PATCH 37/92] Only pass one item to bulk methods for correspondents/doctypes --- .../document-list/bulk-editor/bulk-editor.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 31f7b5566..56ccfae53 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -157,13 +157,13 @@ export class BulkEditorComponent { applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[], forceApply:boolean = false) { let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems) - if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd) + if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd[0]) else if (changedCorrespondents.itemsToRemove.length > 0) this.removeCorrespondents.emit(changedCorrespondents.itemsToRemove) } applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[], forceApply:boolean = false) { let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems) - if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd) + if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd[0]) else if (changedDocumentTypes.itemsToRemove.length > 0) this.removeDocumentTypes.emit(changedDocumentTypes.itemsToRemove) } From 1fb331643614b5811ad3c3435777e06f5172dbb4 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 22 Dec 2020 02:18:05 -0800 Subject: [PATCH 38/92] Fix remove all operations --- .../bulk-editor/bulk-editor.component.html | 6 +++--- .../bulk-editor/bulk-editor.component.ts | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 589739d78..b547b8505 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -35,7 +35,7 @@ [showCounts]="!this.selectionSpansPages" [showRemoveAll]="this.selectionSpansPages" (open)="tagsDropdownOpen()" - (removeAll)="applyTags([], true)" + (removeAll)="removeAllTags()" (editingComplete)="applyTags($event)">
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 56ccfae53..c88a44e25 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -149,24 +149,36 @@ export class BulkEditorComponent { this.initialDocumentTypesToggleableItems = this._documentTypesToggleableItems } - applyTags(newTagsToggleableItems: ToggleableItem[], forceApply:boolean = false) { + applyTags(newTagsToggleableItems: ToggleableItem[]) { let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems) if (changedTags.itemsToAdd.length > 0) this.setTags.emit(changedTags.itemsToAdd) if (changedTags.itemsToRemove.length > 0) this.removeTags.emit(changedTags.itemsToRemove) } - applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[], forceApply:boolean = false) { + removeAllTags() { + this.setTags.emit(null) + } + + applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[]) { let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems) if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd[0]) else if (changedCorrespondents.itemsToRemove.length > 0) this.removeCorrespondents.emit(changedCorrespondents.itemsToRemove) } - applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[], forceApply:boolean = false) { + removeAllCorrespondents() { + this.setDocumentType.emit(null) + } + + applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[]) { let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems) if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd[0]) else if (changedDocumentTypes.itemsToRemove.length > 0) this.removeDocumentTypes.emit(changedDocumentTypes.itemsToRemove) } + removeAllDocumentTypes() { + this.setDocumentType.emit(null) + } + checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems { let itemsToAdd: any[] = [] let itemsToRemove: any[] = [] From 41e842a9e66739dd80898063e46cbdefa9d02666 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 22 Dec 2020 02:58:20 -0800 Subject: [PATCH 39/92] Unify bulk operations logic, working tags assignment and removal --- .../bulk-editor/bulk-editor.component.ts | 28 ++-- .../document-list.component.html | 7 +- .../document-list/document-list.component.ts | 126 +++++++++--------- 3 files changed, 75 insertions(+), 86 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index c88a44e25..bbf5494f0 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -11,7 +11,7 @@ import { DocumentService } from 'src/app/services/rest/document.service'; import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; -interface ChangedItems { +export interface ChangedItems { itemsToAdd: any[], itemsToRemove: any[] } @@ -42,23 +42,14 @@ export class BulkEditorComponent { setTags = new EventEmitter() @Output() - setCorrespondent = new EventEmitter() + setCorrespondents = new EventEmitter() @Output() - setDocumentType = new EventEmitter() + setDocumentTypes = new EventEmitter() @Output() delete = new EventEmitter() - @Output() - removeTags = new EventEmitter() - - @Output() - removeCorrespondents = new EventEmitter() - - @Output() - removeDocumentTypes = new EventEmitter() - tags: PaperlessTag[] correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] @@ -151,8 +142,7 @@ export class BulkEditorComponent { applyTags(newTagsToggleableItems: ToggleableItem[]) { let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems) - if (changedTags.itemsToAdd.length > 0) this.setTags.emit(changedTags.itemsToAdd) - if (changedTags.itemsToRemove.length > 0) this.removeTags.emit(changedTags.itemsToRemove) + if (changedTags.itemsToAdd.length > 0 || changedTags.itemsToRemove.length > 0) this.setTags.emit(changedTags) } removeAllTags() { @@ -161,22 +151,20 @@ export class BulkEditorComponent { applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[]) { let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems) - if (changedCorrespondents.itemsToAdd.length > 0) this.setCorrespondent.emit(changedCorrespondents.itemsToAdd[0]) - else if (changedCorrespondents.itemsToRemove.length > 0) this.removeCorrespondents.emit(changedCorrespondents.itemsToRemove) + if (changedCorrespondents.itemsToAdd.length > 0 || changedCorrespondents.itemsToRemove.length > 0) this.setCorrespondents.emit(changedCorrespondents) } removeAllCorrespondents() { - this.setDocumentType.emit(null) + this.setDocumentTypes.emit(null) } applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[]) { let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems) - if (changedDocumentTypes.itemsToAdd.length > 0) this.setDocumentType.emit(changedDocumentTypes.itemsToAdd[0]) - else if (changedDocumentTypes.itemsToRemove.length > 0) this.removeDocumentTypes.emit(changedDocumentTypes.itemsToRemove) + if (changedDocumentTypes.itemsToAdd.length > 0 || changedDocumentTypes.itemsToRemove.length > 0) this.setDocumentTypes.emit(changedDocumentTypes) } removeAllDocumentTypes() { - this.setDocumentType.emit(null) + this.setDocumentTypes.emit(null) } checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems { 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 d685e6770..816b9b3b6 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 @@ -87,11 +87,8 @@ (selectAll)="list.selectAll()" (selectNone)="list.selectNone()" (setTags)="bulkSetTags($event)" - (removeTags)="bulkRemoveTags($event)" - (setCorrespondent)="bulkSetCorrespondent($event)" - (removeCorrespondents)="bulkRemoveCorrespondents($event)" - (setDocumentType)="bulkSetDocumentType($event)" - (removeDocumentTypes)="bulkRemoveDocumentTypes($event)" + (setCorrespondents)="bulkSetCorrespondents($event)" + (setDocumentTypes)="bulkSetDocumentTypes($event)" (delete)="bulkDelete()">
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 60d763f13..db955020e 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -19,6 +19,7 @@ import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-vi import { PaperlessTag } from 'src/app/data/paperless-tag'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; +import { ChangedItems } from './bulk-editor/bulk-editor.component'; @Component({ selector: 'app-document-list', @@ -156,47 +157,71 @@ export class DocumentListComponent implements OnInit { ) } - bulkSetCorrespondent(correspondent: PaperlessCorrespondent) { + bulkSetTags(changedTags: ChangedItems) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Confirm Correspondent assignment" - let messageFragment = correspondent ? `assign the correspondent ${correspondent.name} to` : `remove all correspondents from` + modal.componentInstance.title = "Confirm Tags Assignment" + let action = 'set_tags' + let tags + let messageFragment = '' + let both = changedTags && changedTags.itemsToAdd.length > 0 && changedTags.itemsToRemove.length > 0 + if (!changedTags) { + messageFragment = `remove all tags from` + } else { + if (changedTags.itemsToAdd.length > 0) { + tags = changedTags.itemsToAdd + messageFragment = `assign the tag(s) ${changedTags.itemsToAdd.map(t => t.name).join(', ')} to` + } + if (changedTags.itemsToRemove.length > 0) { + if (!both) { + // TODO: API endpoint for remove multiple tags + action = 'remove_tags' + tags = changedTags.itemsToRemove + } else { + messageFragment += ' and ' + } + messageFragment += `remove the correspondent(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from` + } + } modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe( + this.executeBulkOperation(action, {"tags": tags ? tags.map(t => t.id) : null}).subscribe( response => { - modal.close() + if (!both) modal.close() + else { + this.executeBulkOperation('remove_tags', {"tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe( + response => { + modal.close() + }) + } } ) }) } - bulkRemoveCorrespondents(correspondents: PaperlessCorrespondent[]) { + bulkSetCorrespondents(changedCorrespondents: ChangedItems) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Confirm Correspondent Removal" - modal.componentInstance.message = `This operation will remove the correspondent(s) ${correspondents.map(t => t.name).join(', ')} from all ${this.list.selected.size} selected document(s).` - modal.componentInstance.btnClass = "btn-warning" - modal.componentInstance.btnCaption = "Confirm" - modal.componentInstance.confirmClicked.subscribe(() => { + modal.componentInstance.title = "Confirm Correspondent Assignment" + let action = 'set_correspondent' + let correspondents + let messageFragment + if (!changedCorrespondents) { + messageFragment = `remove all correspondents from` + } else if (changedCorrespondents.itemsToAdd.length > 0) { + correspondents = changedCorrespondents.itemsToAdd[0] + messageFragment = `assign the correspondent ${correspondents.name} to` + } else { // TODO: API endpoint for remove multiple correspondents - this.executeBulkOperation('remove_correspondents', {"correspondents": correspondents.map(t => t.id)}).subscribe( - response => { - modal.close() - } - ) - }) - } - - bulkSetDocumentType(documentType: PaperlessDocumentType) { - let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Confirm Document Type assignment" - let messageFragment = documentType ? `assign the document type ${documentType.name} to` : `remove all document types from` + action = 'remove_correspondents' + correspondents = changedCorrespondents.itemsToRemove + messageFragment = `remove the correspondent(s) ${correspondents.map(c => c.name).join(', ')} from` + } modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe( + this.executeBulkOperation(action, {"correspondents": correspondents ? correspondents.map(c => c.id) : null}).subscribe( response => { modal.close() } @@ -204,48 +229,27 @@ export class DocumentListComponent implements OnInit { }) } - bulkRemoveDocumentTypes(documentTypes: PaperlessDocumentType[]) { + bulkSetDocumentTypes(changedDocumentTypes: ChangedItems) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Confirm Document Type Removal" - modal.componentInstance.message = `This operation will remove the document type(s) ${documentTypes.map(t => t.name).join(', ')} all ${this.list.selected.size} selected document(s).` - modal.componentInstance.btnClass = "btn-warning" - modal.componentInstance.btnCaption = "Confirm" - modal.componentInstance.confirmClicked.subscribe(() => { - // TODO: API endpoint for remove multiple document types - this.executeBulkOperation('remove_document_types', {"document_types": documentTypes.map(t => t.id)}).subscribe( - response => { - modal.close() - } - ) - }) - } - - bulkSetTags(tags: PaperlessTag[]) { - let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Confirm Tags assignment" - let messageFragment = tags ? `assign the tag(s) ${tags.map(t => t.name).join(', ')} to` : `remove all tags from` + let action = 'set_document_type' + let documentTypes + let messageFragment + if (!changedDocumentTypes) { + messageFragment = `remove all document types from` + } else if (changedDocumentTypes.itemsToAdd.length > 0) { + documentTypes = changedDocumentTypes.itemsToAdd[0] + messageFragment = `assign the document type ${documentTypes.name} to` + } else { + // TODO: API endpoint for remove multiple doc types + action = 'remove_document_types' + documentTypes = changedDocumentTypes.itemsToRemove + messageFragment = `remove the document type(s) ${documentTypes.map(dt => dt.name).join(', ')} from` + } modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { - // TODO: API endpoint for set multiple tags - this.executeBulkOperation('set_tags', {"tags": tags ? tags.map(t => t.id) : null}).subscribe( - response => { - modal.close() - } - ) - }) - } - - bulkRemoveTags(tags: PaperlessTag[]) { - let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Confirm Tags Removal" - modal.componentInstance.message = `This operation will remove the tags ${tags.map(t => t.name).join(', ')} from all ${this.list.selected.size} selected document(s).` - modal.componentInstance.btnClass = "btn-warning" - modal.componentInstance.btnCaption = "Confirm" - modal.componentInstance.confirmClicked.subscribe(() => { - // TODO: API endpoint for remove multiple tags - this.executeBulkOperation('remove_tags', {"tags": tags.map(t => t.id)}).subscribe( + this.executeBulkOperation(action, {"document_types": documentTypes ? documentTypes.map(dt => dt.id) : null}).subscribe( response => { modal.close() } From 0a4a06b99157f8dddf22d85e88fd9e3ac103e0db Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 22 Dec 2020 03:13:57 -0800 Subject: [PATCH 40/92] Singular items dont need removal logic since dropdowns dont support this (yet?) --- .../document-list/document-list.component.ts | 43 ++++++------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index db955020e..9e2652ceb 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -179,7 +179,7 @@ export class DocumentListComponent implements OnInit { } else { messageFragment += ' and ' } - messageFragment += `remove the correspondent(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from` + messageFragment += `remove the tag(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from` } } modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` @@ -203,25 +203,17 @@ export class DocumentListComponent implements OnInit { bulkSetCorrespondents(changedCorrespondents: ChangedItems) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Correspondent Assignment" - let action = 'set_correspondent' - let correspondents - let messageFragment - if (!changedCorrespondents) { - messageFragment = `remove all correspondents from` - } else if (changedCorrespondents.itemsToAdd.length > 0) { - correspondents = changedCorrespondents.itemsToAdd[0] - messageFragment = `assign the correspondent ${correspondents.name} to` - } else { - // TODO: API endpoint for remove multiple correspondents - action = 'remove_correspondents' - correspondents = changedCorrespondents.itemsToRemove - messageFragment = `remove the correspondent(s) ${correspondents.map(c => c.name).join(', ')} from` + let correspondent + let messageFragment = 'remove all correspondents from' + if (changedCorrespondents && changedCorrespondents.itemsToAdd.length > 0) { + correspondent = changedCorrespondents.itemsToAdd[0] + messageFragment = `assign the correspondent ${correspondent.name} to` } modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation(action, {"correspondents": correspondents ? correspondents.map(c => c.id) : null}).subscribe( + this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe( response => { modal.close() } @@ -231,25 +223,18 @@ export class DocumentListComponent implements OnInit { bulkSetDocumentTypes(changedDocumentTypes: ChangedItems) { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - let action = 'set_document_type' - let documentTypes - let messageFragment - if (!changedDocumentTypes) { - messageFragment = `remove all document types from` - } else if (changedDocumentTypes.itemsToAdd.length > 0) { - documentTypes = changedDocumentTypes.itemsToAdd[0] - messageFragment = `assign the document type ${documentTypes.name} to` - } else { - // TODO: API endpoint for remove multiple doc types - action = 'remove_document_types' - documentTypes = changedDocumentTypes.itemsToRemove - messageFragment = `remove the document type(s) ${documentTypes.map(dt => dt.name).join(', ')} from` + modal.componentInstance.title = "Confirm Document Type Assignment" + let documentType + let messageFragment = 'remove all document types from' + if (changedDocumentTypes && changedDocumentTypes.itemsToAdd.length > 0) { + documentType = changedDocumentTypes.itemsToAdd[0] + messageFragment = `assign the document type ${documentType.name} to` } modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation(action, {"document_types": documentTypes ? documentTypes.map(dt => dt.id) : null}).subscribe( + this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe( response => { modal.close() } From 406f8daa1273e93db1ea4ea4110d30e1428a9b95 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 22 Dec 2020 03:32:51 -0800 Subject: [PATCH 41/92] TODO comment --- .../src/app/components/document-list/document-list.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 9e2652ceb..91fd0cd40 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -173,7 +173,6 @@ export class DocumentListComponent implements OnInit { } if (changedTags.itemsToRemove.length > 0) { if (!both) { - // TODO: API endpoint for remove multiple tags action = 'remove_tags' tags = changedTags.itemsToRemove } else { @@ -186,6 +185,7 @@ export class DocumentListComponent implements OnInit { modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { + // TODO: API endpoints for add/remove multiple tags this.executeBulkOperation(action, {"tags": tags ? tags.map(t => t.id) : null}).subscribe( response => { if (!both) modal.close() From c4286d0a481e17b6d3bed4056c4462fba1005560 Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Tue, 22 Dec 2020 16:33:41 +0100 Subject: [PATCH 42/92] Update README.md --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 32ff2ab4a..526644685 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,13 @@ Here's what you get: * Auto completion suggests relevant words from your documents. * Results are sorted by relevance to your search query. * Highlighting shows you which parts of the document matched the query. + * Searching for similar documents ("More like this") * Email processing: Paperless adds documents from your email accounts. * Configure multiple accounts and filters for each account. * When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them. * Machine learning powered document matching. * Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless. * A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast. -* Code cleanup in many, MANY areas. Some of the code from OG paperless was just overly complicated. -* More tests, more stability. If you want to see some screenshots of paperless-ng in action, [some are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html). @@ -54,10 +53,7 @@ For a complete list of changes from paperless, check out the [changelog](https:/ # Roadmap for 1.0 -- **Bulk editing**. Add/remove metadata from multiple documents at once. - - Make the front end nice (except mobile). -- Test coverage at 90%. - Fix whatever bugs I and you find. ## Roadmap for versions beyond 1.0 @@ -66,7 +62,6 @@ These are things that I want to add to paperless eventually. They are sorted by - **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like: - Group and limit search results by correspondent, show “more from this” links in the results. - - Ability to search for “Similar documents” in the search results - **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system. - **An interactive consumer** that shows its progress for documents it processes on the web page. - With live updates ans websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particular happy about. From 7d676a75a84dbf1e82a044c0a1dd5569daa31537 Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Tue, 22 Dec 2020 17:26:07 +0100 Subject: [PATCH 43/92] Update README.md --- README.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 526644685..978684d76 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # Paperless-ng -[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. +[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation. @@ -64,10 +64,10 @@ These are things that I want to add to paperless eventually. They are sorted by - Group and limit search results by correspondent, show “more from this” links in the results. - **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system. - **An interactive consumer** that shows its progress for documents it processes on the web page. - - With live updates ans websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particular happy about. + - With live updates and websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particularly happy about. - Notifications when a document was added with buttons to open the new document right away. - **Arbitrary tag colors**. Allow the selection of any color with a color picker. -- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc, .docx documents. +- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc and .docx documents. Apart from that, paperless is pretty much feature complete. @@ -75,6 +75,15 @@ Apart from that, paperless is pretty much feature complete. - **GnuPG encrypion.** [Here's a note about encryption in paperless](https://paperless-ng.readthedocs.io/en/latest/administration.html#managing-encryption). The gist of it is that I don't see which attacks this implementation protects against. It gives a false sense of security to users who don't care about how it works. +## Wont-do list. + +These features will probably never make it into paperless, since paperless is meant to be an easy to use set-and-forget solution. + +- **Document versions.** I might consider adding the ability to update a document with a newer version, but that's about it. The kind of documents that get added to paperless usually don't change at all. +- **Workflows.** I don't see a use case for these, yet. +- **Folders.** Tags are superior in just about every way. +- **Apps / extension support.** Again, paperless is meant to be simple. + # Getting started The recommended way to deploy paperless is docker-compose. Don't clone the repository, grab the latest release to get started instead. The dockerfiles archive contains just the docker files which will pull the image from docker hub. The source archive contains everything you need to build the docker image yourself (i.e. if you want to run on Raspberry Pi). From 9c2c74ad2b67bdfcf8c2b74a76fd82ff2ff9e5f9 Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Wed, 23 Dec 2020 01:51:38 +0100 Subject: [PATCH 44/92] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 978684d76..214f90b6f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build Status](https://travis-ci.org/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.org/jonaswinkler/paperless-ng) [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng) -[![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master) *<-- green badge, yay :)* # Paperless-ng From 6589369e1b62505d79801ca8d496e6e6c6950151 Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Wed, 23 Dec 2020 02:29:58 +0100 Subject: [PATCH 45/92] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 214f90b6f..1806fd4bb 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ These are things that I want to add to paperless eventually. They are sorted by - **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like: - Group and limit search results by correspondent, show “more from this” links in the results. - **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system. +- **Localization.** I won't translate paperless into any other languages except English and German, however, I'll add the necessary means so that anyone can translate paperless into their favorite language. - **An interactive consumer** that shows its progress for documents it processes on the web page. - With live updates and websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particularly happy about. - Notifications when a document was added with buttons to open the new document right away. From 929b25a96983af002c4f7cddaa1937d2b4485943 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Wed, 23 Dec 2020 15:13:55 +0100 Subject: [PATCH 46/92] add api support for adding and removing many tags simultaneously --- src/documents/bulk_edit.py | 23 +++++++++++++++++++++++ src/documents/serialisers.py | 28 ++++++++++++++++++++++++++-- src/documents/tests/test_api.py | 9 +++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py index aa5b8ea3f..132547704 100644 --- a/src/documents/bulk_edit.py +++ b/src/documents/bulk_edit.py @@ -1,3 +1,5 @@ +import itertools + from django.db.models import Q from django_q.tasks import async_task @@ -66,6 +68,27 @@ def remove_tag(doc_ids, tag): return "OK" +def modify_tags(doc_ids, add_tags, remove_tags): + qs = Document.objects.filter(id__in=doc_ids) + affected_docs = [doc.id for doc in qs] + + DocumentTagRelationship = Document.tags.through + + DocumentTagRelationship.objects.filter( + document_id__in=affected_docs, + tag_id__in=remove_tags, + ).delete() + + DocumentTagRelationship.objects.bulk_create([ + DocumentTagRelationship( + document_id=doc, tag_id=tag) for (doc,tag) in itertools.product(affected_docs, add_tags) + ], ignore_conflicts=True) + + async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) + + return "OK" + + def delete(doc_ids): Document.objects.filter(id__in=doc_ids).delete() diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index d9f1833bf..f34176d8a 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -217,6 +217,7 @@ class BulkEditSerializer(serializers.Serializer): "set_document_type", "add_tag", "remove_tag", + "modify_tags", "delete" ], label="Method", @@ -225,11 +226,19 @@ class BulkEditSerializer(serializers.Serializer): parameters = serializers.DictField(allow_empty=True) - def validate_documents(self, documents): + def _validate_document_id_list(self, documents, name="documents"): + if not type(documents) == list: + raise serializers.ValidationError(f"{name} must be a list") + if not all([type(i) == int for i in documents]): + raise serializers.ValidationError(f"{name} must be a list of integers") count = Document.objects.filter(id__in=documents).count() if not count == len(documents): raise serializers.ValidationError( - "Some documents don't exist or were specified twice.") + f"Some documents in {name} don't exist or were specified twice.") + + + def validate_documents(self, documents): + self._validate_document_id_list(documents) return documents def validate_method(self, method): @@ -241,6 +250,8 @@ class BulkEditSerializer(serializers.Serializer): return bulk_edit.add_tag elif method == "remove_tag": return bulk_edit.remove_tag + elif method == "modify_tags": + return bulk_edit.modify_tags elif method == "delete": return bulk_edit.delete else: @@ -283,6 +294,17 @@ class BulkEditSerializer(serializers.Serializer): else: raise serializers.ValidationError("correspondent not specified") + def _validate_parameters_modify_tags(self, parameters): + if "add_tags" in parameters: + self._validate_document_id_list(parameters['add_tags'], "add_tags") + else: + raise serializers.ValidationError("add_tags not specified") + + if "remove_tags" in parameters: + self._validate_document_id_list(parameters['remove_tags'], "remove_tags") + else: + raise serializers.ValidationError("remove_tags not specified") + def validate(self, attrs): method = attrs['method'] @@ -294,6 +316,8 @@ class BulkEditSerializer(serializers.Serializer): self._validate_parameters_document_type(parameters) elif method == bulk_edit.add_tag or method == bulk_edit.remove_tag: self._validate_parameters_tags(parameters) + elif method == bulk_edit.modify_tags: + self._validate_parameters_modify_tags(parameters) return attrs diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 0262b6d6a..030de652d 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -743,6 +743,15 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): args, kwargs = self.async_task.call_args self.assertCountEqual(kwargs['document_ids'], [self.doc4.id]) + def test_modify_tags(self): + tag_unrelated = Tag.objects.create(name="unrelated") + self.doc2.tags.add(tag_unrelated) + self.doc3.tags.add(tag_unrelated) + bulk_edit.modify_tags([self.doc2.id, self.doc3.id], add_tags=[self.t2.id], remove_tags=[self.t1.id]) + + self.assertCountEqual(list(self.doc2.tags.all()), [self.t2, tag_unrelated]) + self.assertCountEqual(list(self.doc3.tags.all()), [self.t2, tag_unrelated]) + def test_delete(self): self.assertEqual(Document.objects.count(), 5) bulk_edit.delete([self.doc1.id, self.doc2.id]) From c54d26ed195c12a666480111855b7ac34252161a Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Wed, 23 Dec 2020 16:09:13 +0100 Subject: [PATCH 47/92] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1806fd4bb..7a5f6028d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [![Build Status](https://travis-ci.org/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.org/jonaswinkler/paperless-ng) [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest) +[![Gitter](https://badges.gitter.im/paperless-ng/community.svg)](https://gitter.im/paperless-ng/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng) [![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master) *<-- green badge, yay :)* From 64d0c7fae6e52869ac52d4c0673085e20089d5bb Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Wed, 23 Dec 2020 18:07:37 +0100 Subject: [PATCH 48/92] silence compiler warnings --- src-ui/angular.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src-ui/angular.json b/src-ui/angular.json index 2ff1bb3b0..79233eeda 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -31,7 +31,10 @@ "styles": [ "src/styles.scss" ], - "scripts": [] + "scripts": [], + "allowedCommonJsDependencies": [ + "ng2-pdf-viewer" + ] }, "configurations": { "production": { @@ -127,4 +130,4 @@ } }, "defaultProject": "paperless-ui" -} \ No newline at end of file +} From eec9716ffaf19289aeedd45306301df332f15bba Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Wed, 23 Dec 2020 22:34:30 +0100 Subject: [PATCH 49/92] more translation markers --- .../document-list.component.html | 3 ++- .../components/search/search.component.html | 12 ++++----- src-ui/src/app/data/paperless-tag.ts | 26 +++++++++---------- src-ui/src/app/pipes/document-title.pipe.ts | 2 +- src-ui/src/app/pipes/yes-no.pipe.ts | 2 +- 5 files changed, 22 insertions(+), 23 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 888639b5e..1f58846b8 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 @@ -91,7 +91,8 @@
-

Selected {{list.selected.size}} of {{list.collectionSize || 0}} document(s) (filtered)

+

Selected {{list.selected.size}} of {{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}

+

{{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}

diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html index ba2253401..7047a3144 100644 --- a/src-ui/src/app/components/search/search.component.html +++ b/src-ui/src/app/components/search/search.component.html @@ -3,21 +3,19 @@
Invalid search query: {{errorMessage}}
-

- Showing documents similar to - {{more_like_doc?.original_file_name}} +

+ Showing documents similar to {{more_like_doc?.original_file_name}}

- Search string: {{query}} + Search query: {{query}} - - Did you mean "{{correctedQuery}}"? + - Did you mean "{{correctedQuery}}"? -

-

{{resultCount}} result(s)

+

{resultCount, plural, =0 {No results} =1 {One result} other {{{resultCount}} results}}

Date: Wed, 23 Dec 2020 22:45:54 +0100 Subject: [PATCH 50/92] a couple small changes --- .../components/document-detail/document-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index f569c1033..daf01249f 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -58,7 +58,7 @@
- +
@@ -139,7 +139,7 @@
- +
From 37caf6a64a6eaa96dba6cd5ed5d0e6cd7f70dc2f Mon Sep 17 00:00:00 2001 From: Andrew Rowson Date: Thu, 24 Dec 2020 11:53:20 +0000 Subject: [PATCH 51/92] Gunicorn should bind to both ipv4 and ipv6 As per https://docs.gunicorn.org/en/stable/settings.html#bind --- docker/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/supervisord.conf b/docker/supervisord.conf index ebe0f005d..ff3ed4311 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -8,7 +8,7 @@ loglevel=info ; log level; default info; others: debug,warn,trace user=root [program:gunicorn] -command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi +command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b '[::]:8000' paperless.wsgi user=paperless stdout_logfile=/dev/stdout From 6e79b771ece557cfe5792d4152019069934542dc Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 25 Dec 2020 00:58:17 -0800 Subject: [PATCH 52/92] Refactor bulk editor to be self-contained See https://github.com/jonaswinkler/paperless-ng/pull/162#issuecomment-750425915 --- .../bulk-editor/bulk-editor.component.html | 6 +- .../bulk-editor/bulk-editor.component.ts | 182 ++++++++++++++---- .../document-list.component.html | 13 +- .../document-list/document-list.component.ts | 126 +----------- 4 files changed, 148 insertions(+), 179 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index b547b8505..11d3603b2 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1,6 +1,6 @@
- -
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 19b913af0..a5732b922 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -126,37 +126,6 @@ export class BulkEditorComponent { this.initialDocumentTypesToggleableItems = this._documentTypesToggleableItems } - applyTags(newTagsToggleableItems: ToggleableItem[]) { - let changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems) - if (changedTags.itemsToAdd.length > 0 || changedTags.itemsToRemove.length > 0) this.bulkSetTags(changedTags) - } - - removeAllTags() { - this.bulkSetTags(null) - } - - applyCorrespondent(newCorrespondentsToggleableItems: ToggleableItem[]) { - let changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems) - if (changedCorrespondents.itemsToAdd.length > 0 || changedCorrespondents.itemsToRemove.length > 0) this.bulkSetCorrespondents(changedCorrespondents) - } - - removeAllCorrespondents() { - this.bulkSetCorrespondents(null) - } - - applyDocumentType(newDocumentTypesToggleableItems: ToggleableItem[]) { - let changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems) - if (changedDocumentTypes.itemsToAdd.length > 0 || changedDocumentTypes.itemsToRemove.length > 0) this.bulkSetDocumentTypes(changedDocumentTypes) - } - - removeAllDocumentTypes() { - this.bulkSetDocumentTypes(null) - } - - applyDelete() { - this.bulkDelete() - } - private checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems { let itemsToAdd: any[] = [] let itemsToRemove: any[] = [] @@ -181,7 +150,13 @@ export class BulkEditorComponent { ) } - private bulkSetTags(changedTags: ChangedItems) { + setTags(newTagsToggleableItems: ToggleableItem[]) { + let changedTags: ChangedItems + if (newTagsToggleableItems) { + changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems) + if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return + } + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Tags Assignment" let action = 'set_tags' @@ -224,7 +199,13 @@ export class BulkEditorComponent { }) } - private bulkSetCorrespondents(changedCorrespondents: ChangedItems) { + setCorrespondents(newCorrespondentsToggleableItems: ToggleableItem[]) { + let changedCorrespondents: ChangedItems + if (newCorrespondentsToggleableItems) { + changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems) + if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return + } + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Correspondent Assignment" let correspondent @@ -245,7 +226,13 @@ export class BulkEditorComponent { }) } - private bulkSetDocumentTypes(changedDocumentTypes: ChangedItems) { + setDocumentTypes(newDocumentTypesToggleableItems: ToggleableItem[]) { + let changedDocumentTypes: ChangedItems + if (newDocumentTypesToggleableItems) { + changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems) + if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return + } + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Document Type Assignment" let documentType @@ -266,7 +253,7 @@ export class BulkEditorComponent { }) } - private bulkDelete() { + applyDelete() { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.delayConfirm(5) modal.componentInstance.title = "Delete confirm" From f7f78d80b757918c33bb1144de1e62899168eb00 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Fri, 25 Dec 2020 19:01:46 +0100 Subject: [PATCH 54/92] added isnull filters for document types and correspondents --- src/documents/filters.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/documents/filters.py b/src/documents/filters.py index b3c92eba3..4614d292b 100755 --- a/src/documents/filters.py +++ b/src/documents/filters.py @@ -98,12 +98,14 @@ class DocumentFilterSet(FilterSet): "added": DATE_KWARGS, "modified": DATE_KWARGS, + "correspondent": ["isnull"], "correspondent__id": ID_KWARGS, "correspondent__name": CHAR_KWARGS, "tags__id": ID_KWARGS, "tags__name": CHAR_KWARGS, + "document_type": ["isnull"], "document_type__id": ID_KWARGS, "document_type__name": CHAR_KWARGS, From b9cf517cd139f4cf8f3194cb60e9384718c57c5e Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Fri, 25 Dec 2020 19:06:12 +0100 Subject: [PATCH 55/92] front end client support for filtering for no correspondent/document type --- src-ui/src/app/data/filter-rule-type.ts | 5 +++-- src-ui/src/app/services/rest/document.service.ts | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts index ea8e60eee..173425c92 100644 --- a/src-ui/src/app/data/filter-rule-type.ts +++ b/src-ui/src/app/data/filter-rule-type.ts @@ -25,8 +25,8 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false}, - {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", datatype: "correspondent", multi: false}, - {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", datatype: "document_type", multi: false}, + {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", isnull_filtervar: "correspondent__isnull", datatype: "correspondent", multi: false}, + {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false}, {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true}, {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true}, @@ -51,6 +51,7 @@ export interface FilterRuleType { id: number name: string filtervar: string + isnull_filtervar?: string datatype: string //number, string, boolean, date multi: boolean default?: any diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts index ec5c7689b..ff17e972e 100644 --- a/src-ui/src/app/services/rest/document.service.ts +++ b/src-ui/src/app/services/rest/document.service.ts @@ -38,6 +38,8 @@ export class DocumentService extends AbstractPaperlessService let ruleType = FILTER_RULE_TYPES.find(t => t.id == rule.rule_type) if (ruleType.multi) { params[ruleType.filtervar] = params[ruleType.filtervar] ? params[ruleType.filtervar] + "," + rule.value : rule.value + } else if (ruleType.isnull_filtervar && rule.value == null) { + params[ruleType.isnull_filtervar] = true } else { params[ruleType.filtervar] = rule.value } From 03838421bc61d489cf895153d84302346c013fb3 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Fri, 25 Dec 2020 19:23:53 +0100 Subject: [PATCH 56/92] not sure when that got in here --- src-ui/src/app/components/dashboard/dashboard.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index 0dca25d8a..a5f857b99 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -24,7 +24,7 @@ export class DashboardComponent implements OnInit { } else if (tagUsername && tagUsername.content) { return tagUsername.content } else { - return "null" + return null } } From 20e724da464277266e7e7fea80badefc4bb1b15e Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Fri, 25 Dec 2020 19:24:39 +0100 Subject: [PATCH 57/92] fixes #182 --- src-ui/src/app/components/app-frame/app-frame.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5fe42fc40..d191ec0de 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 @@ -1,8 +1,8 @@
- +
-
{{toggleableItem?.count}}
+
{{toggleableItem?.count}}
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index adfea556a..400029615 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -23,9 +23,6 @@ export class ToggleableDropdownButtonComponent { @Input() toggleableItem: ToggleableItem - @Input() - showCounts: boolean = true - @Output() toggle = new EventEmitter() diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index aa85fdb12..fd619717f 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -32,21 +32,18 @@ From a283b815ef3f07be46af85ff18aa5f9f00df60dd Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Sun, 27 Dec 2020 13:34:36 +0100 Subject: [PATCH 68/92] refactor --- .../toggleable-dropdown-button.component.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index 400029615..cffbc916f 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -36,9 +36,12 @@ export class ToggleableDropdownButtonComponent { } getSelectedIconName() { - let iconName = '' - if (this.toggleableItem?.state == ToggleableItemState.Selected) iconName = 'check' - else if (this.toggleableItem?.state == ToggleableItemState.PartiallySelected) iconName = 'dash' - return iconName + if (this.toggleableItem?.state == ToggleableItemState.Selected) { + return "check" + } else if (this.toggleableItem?.state == ToggleableItemState.PartiallySelected) { + return "dash" + } else { + return "" + } } } From c2a47ca4b10c283868dfd8e9ced9af971a0e1abf Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Sun, 27 Dec 2020 13:34:54 +0100 Subject: [PATCH 69/92] remove "selectionSpansPages" --- .../document-list/bulk-editor/bulk-editor.component.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index a5732b922..4365e00b0 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -39,16 +39,11 @@ export class BulkEditorComponent { dropdownTypes = FilterableDropdownType - get selectionSpansPages(): boolean { - return this.documentList.selected.size > this.documentList.documents.length || !Array.from(this.documentList.selected).every(sd => this.documentList.documents.find(d => d.id == sd)) - } - private _tagsToggleableItems: ToggleableItem[] get tagsToggleableItems(): ToggleableItem[] { let tagsToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id)) - if (this.selectionSpansPages) selectedDocuments = [] - + this.tags?.forEach(t => { let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id)) let state = ToggleableItemState.NotSelected @@ -64,7 +59,6 @@ export class BulkEditorComponent { get correspondentsToggleableItems(): ToggleableItem[] { let correspondentsToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id)) - if (this.selectionSpansPages) selectedDocuments = [] this.correspondents?.forEach(c => { let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id) @@ -81,7 +75,6 @@ export class BulkEditorComponent { get documentTypesToggleableItems(): ToggleableItem[] { let documentTypesToggleableItems = [] let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id)) - if (this.selectionSpansPages) selectedDocuments = [] this.documentTypes?.forEach(dt => { let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id) From fb830699752a13c044dcd00468a203c4ddcc6671 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Sun, 27 Dec 2020 14:50:57 +0100 Subject: [PATCH 70/92] fix test case. --- src/documents/tests/test_consumer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index f53981850..795ca7f95 100644 --- a/src/documents/tests/test_consumer.py +++ b/src/documents/tests/test_consumer.py @@ -350,7 +350,7 @@ class TestConsumer(DirectoriesMixin, TestCase): try: self.consumer.try_consume_file(self.get_test_file()) except ConsumerError as e: - self.assertTrue("No parsers abvailable for" in str(e)) + self.assertEqual("Unsupported mime type application/pdf of file sample.pdf", str(e)) return self.fail("Should throw exception") From 6a70369a77246d298eb741a832736ad0148ec8ad Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Sun, 27 Dec 2020 17:05:35 +0100 Subject: [PATCH 71/92] update index after bulk edit operations #195 --- src/documents/bulk_edit.py | 27 +++++++++++++++++++++++++ src/documents/index.py | 13 +++++------- src/documents/tasks.py | 9 +++++++++ src/documents/tests/test_api.py | 36 ++++++++++++++++----------------- 4 files changed, 59 insertions(+), 26 deletions(-) diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py index aa5b8ea3f..fd787f56a 100644 --- a/src/documents/bulk_edit.py +++ b/src/documents/bulk_edit.py @@ -1,6 +1,8 @@ from django.db.models import Q from django_q.tasks import async_task +from whoosh.writing import AsyncWriter +from documents import index from documents.models import Document, Correspondent, DocumentType @@ -13,6 +15,11 @@ def set_correspondent(doc_ids, correspondent): affected_docs = [doc.id for doc in qs] qs.update(correspondent=correspondent) + async_task( + "documents.tasks.bulk_index_documents", + document_ids=affected_docs + ) + async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) return "OK" @@ -27,6 +34,11 @@ def set_document_type(doc_ids, document_type): affected_docs = [doc.id for doc in qs] qs.update(document_type=document_type) + async_task( + "documents.tasks.bulk_index_documents", + document_ids=affected_docs + ) + async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) return "OK" @@ -44,6 +56,11 @@ def add_tag(doc_ids, tag): document_id=doc, tag_id=tag) for doc in affected_docs ]) + async_task( + "documents.tasks.bulk_index_documents", + document_ids=affected_docs + ) + async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) return "OK" @@ -61,6 +78,11 @@ def remove_tag(doc_ids, tag): Q(tag_id=tag) ).delete() + async_task( + "documents.tasks.bulk_index_documents", + document_ids=affected_docs + ) + async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) return "OK" @@ -69,4 +91,9 @@ def remove_tag(doc_ids, tag): def delete(doc_ids): Document.objects.filter(id__in=doc_ids).delete() + ix = index.open_index() + with AsyncWriter(ix) as writer: + for id in doc_ids: + index.remove_document_by_id(writer, id) + return "OK" diff --git a/src/documents/index.py b/src/documents/index.py index 308ee932e..51197e252 100644 --- a/src/documents/index.py +++ b/src/documents/index.py @@ -87,11 +87,6 @@ def open_index(recreate=False): def update_document(writer, doc): - # TODO: this line caused many issues all around, since: - # We need to make sure that this method does not get called with - # deserialized documents (i.e, document objects that don't come from - # Django's ORM interfaces directly. - logger.debug("Indexing {}...".format(doc)) tags = ",".join([t.name for t in doc.tags.all()]) writer.update_document( id=doc.pk, @@ -107,9 +102,11 @@ def update_document(writer, doc): def remove_document(writer, doc): - # TODO: see above. - logger.debug("Removing {} from index...".format(doc)) - writer.delete_by_term('id', doc.pk) + remove_document_by_id(writer, doc.pk) + + +def remove_document_by_id(writer, doc_id): + writer.delete_by_term('id', doc_id) def add_or_update_document(document): diff --git a/src/documents/tasks.py b/src/documents/tasks.py index fafe6e10f..c1f3ffbaa 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -94,3 +94,12 @@ def bulk_rename_files(document_ids): qs = Document.objects.filter(id__in=document_ids) for doc in qs: post_save.send(Document, instance=doc, created=False) + + +def bulk_index_documents(document_ids): + documents = Document.objects.filter(id__in=document_ids) + + ix = index.open_index() + with AsyncWriter(ix) as writer: + for doc in documents: + index.update_document(writer, doc) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 0262b6d6a..35b998a9d 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -699,49 +699,49 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1) bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], self.c2.id) self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 3) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id]) + self.assertEqual(self.async_task.call_count, 2) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id]) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id]) def test_unset_correspondent(self): self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1) bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], None) self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 0) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id]) + self.assertEqual(self.async_task.call_count, 2) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id]) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id]) def test_set_document_type(self): self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1) bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], self.dt2.id) self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 3) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id]) + self.assertEqual(self.async_task.call_count, 2) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id]) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id]) def test_unset_document_type(self): self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1) bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], None) self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 0) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id]) + self.assertEqual(self.async_task.call_count, 2) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id]) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id]) def test_add_tag(self): self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2) bulk_edit.add_tag([self.doc1.id, self.doc2.id, self.doc3.id, self.doc4.id], self.t1.id) self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 4) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc3.id]) + self.assertEqual(self.async_task.call_count, 2) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc3.id]) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc3.id]) def test_remove_tag(self): self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2) bulk_edit.remove_tag([self.doc1.id, self.doc3.id, self.doc4.id], self.t1.id) self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 1) - self.async_task.assert_called_once() - args, kwargs = self.async_task.call_args - self.assertCountEqual(kwargs['document_ids'], [self.doc4.id]) + self.assertEqual(self.async_task.call_count, 2) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc4.id]) + self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc4.id]) def test_delete(self): self.assertEqual(Document.objects.count(), 5) From 131ebf0480d88b6f6363785b42e0ae3259495992 Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Sun, 27 Dec 2020 17:07:33 +0100 Subject: [PATCH 72/92] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a5f6028d..7f3808905 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest) [![Gitter](https://badges.gitter.im/paperless-ng/community.svg)](https://gitter.im/paperless-ng/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng) -[![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master) *<-- green badge, yay :)* +[![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master) # Paperless-ng From b8e7506de42723538faac6aab528a0b17ad8290f Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Sun, 27 Dec 2020 23:55:19 +0100 Subject: [PATCH 73/92] partial selection model implementation --- .../date-dropdown/date-dropdown.component.ts | 12 +- .../filterable-dropdown.component.html | 12 +- .../filterable-dropdown.component.ts | 145 ++++++++---- .../toggleable-dropdown-button.component.ts | 3 +- .../bulk-editor/bulk-editor.component.html | 4 +- .../filter-editor.component.html | 10 +- .../filter-editor/filter-editor.component.ts | 222 +++++++----------- 7 files changed, 199 insertions(+), 209 deletions(-) diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts index e787ce11e..1bf5d0216 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts @@ -30,9 +30,15 @@ export class DateDropdownComponent implements OnInit, OnDestroy { @Input() dateBefore: string + @Output() + dateBeforeChange = new EventEmitter() + @Input() dateAfter: string + @Output() + dateAfterChange = new EventEmitter() + @Input() title: string @@ -83,6 +89,8 @@ export class DateDropdownComponent implements OnInit, OnDestroy { } onChange() { + this.dateAfterChange.emit(this.dateAfter) + this.dateBeforeChange.emit(this.dateBefore) this.datesSet.emit({after: this.dateAfter, before: this.dateBefore}) } @@ -91,12 +99,12 @@ export class DateDropdownComponent implements OnInit, OnDestroy { } clearBefore() { - this.dateBefore = null; + this.dateBefore = null this.onChange() } clearAfter() { - this.dateAfter = null; + this.dateAfter = null this.onChange() } diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 5f9440336..1261ff921 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -1,14 +1,14 @@
- @@ -19,9 +19,9 @@
-
- - +
+ +
- - + +
- - {{toggleableItem?.item.name}} + + {{item.name}}
-
{{toggleableItem?.count}}
+
{{item.document_count}}
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index b881edd5d..1d42b0946 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -21,13 +21,19 @@ export enum ToggleableItemState { export class ToggleableDropdownButtonComponent { @Input() - toggleableItem: ToggleableItem + item: MatchingModel + + @Input() + state: ToggleableItemState + + @Input() + count: number @Output() toggle = new EventEmitter() get isTag(): boolean { - return 'is_inbox_tag' in this.toggleableItem?.item // ~ this.item instanceof PaperlessTag + return 'is_inbox_tag' in this.item } toggleItem(): void { @@ -35,9 +41,9 @@ export class ToggleableDropdownButtonComponent { } getSelectedIconName() { - if (this.toggleableItem?.state == ToggleableItemState.Selected) { + if (this.state == ToggleableItemState.Selected) { return "check" - } else if (this.toggleableItem?.state == ToggleableItemState.PartiallySelected) { + } else if (this.state == ToggleableItemState.PartiallySelected) { return "dash" } else { return "" diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index 3b072c434..f881dc1d9 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -3,13 +3,14 @@ import { PaperlessTag } from 'src/app/data/paperless-tag'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { Subject, Subscription } from 'rxjs'; -import { debounceTime, distinctUntilChanged, filter, flatMap, mergeMap } from 'rxjs/operators'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { TagService } from 'src/app/services/rest/tag.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { FilterRule } from 'src/app/data/filter-rule'; -import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES, FILTER_TITLE } from 'src/app/data/filter-rule-type'; +import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE } from 'src/app/data/filter-rule-type'; import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component'; +import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; @Component({ selector: 'app-filter-editor', @@ -61,7 +62,6 @@ export class FilterEditorComponent implements OnInit, OnDestroy { @Input() set filterRules (value: FilterRule[]) { - console.log("SET FILTER RULES") value.forEach(rule => { switch (rule.rule_type) { case FILTER_TITLE: @@ -79,31 +79,34 @@ export class FilterEditorComponent implements OnInit, OnDestroy { case FILTER_ADDED_BEFORE: this.dateAddedBefore = rule.value break + case FILTER_HAS_TAG: + this.tagSelectionModel.set(+rule.value, ToggleableItemState.Selected, false) + break + case FILTER_CORRESPONDENT: + this.correspondentSelectionModel.set(+rule.value, ToggleableItemState.Selected, false) + break + case FILTER_DOCUMENT_TYPE: + this.documentTypeSelectionModel.set(+rule.value, ToggleableItemState.Selected, false) + break } }) - - this.tagService.getCachedMany(value.filter(v => v.rule_type == FILTER_HAS_TAG).map(rule => +rule.value)).subscribe(tags => { - console.log(tags) - tags.forEach(tag => this.tagSelectionModel.toggle(tag, false)) - }) } @Output() filterRulesChange = new EventEmitter() updateRules() { - console.log("UPDATE RULES!!!") let filterRules: FilterRule[] = [] if (this._titleFilter) { filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter}) } - this.tagSelectionModel.getSelected().forEach(tag => { + this.tagSelectionModel.getSelectedItems().forEach(tag => { filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id.toString()}) }) - this.correspondentSelectionModel.getSelected().forEach(correspondent => { + this.correspondentSelectionModel.getSelectedItems().forEach(correspondent => { filterRules.push({rule_type: FILTER_CORRESPONDENT, value: correspondent.id.toString()}) }) - this.documentTypeSelectionModel.getSelected().forEach(documentType => { + this.documentTypeSelectionModel.getSelectedItems().forEach(documentType => { filterRules.push({rule_type: FILTER_DOCUMENT_TYPE, value: documentType.id.toString()}) }) if (this.dateCreatedBefore) { @@ -118,13 +121,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy { if (this.dateAddedAfter) { filterRules.push({rule_type: FILTER_ADDED_AFTER, value: this.dateAddedAfter}) } - console.log(filterRules) this.filterRulesChange.next(filterRules) } hasFilters() { return this._titleFilter || - this.dateCreatedAfter || this.dateAddedBefore || this.dateCreatedAfter || this.dateCreatedBefore || + this.dateAddedAfter || this.dateAddedBefore || this.dateCreatedAfter || this.dateCreatedBefore || this.tagSelectionModel.selectionSize() || this.correspondentSelectionModel.selectionSize() || this.documentTypeSelectionModel.selectionSize() } @@ -161,16 +163,26 @@ export class FilterEditorComponent implements OnInit, OnDestroy { clearSelected() { this._titleFilter = "" + this.tagSelectionModel.clear(false) + this.documentTypeSelectionModel.clear(false) + this.correspondentSelectionModel.clear(false) + this.dateAddedBefore = null + this.dateAddedAfter = null + this.dateCreatedBefore = null + this.dateCreatedAfter = null this.updateRules() } toggleTag(tagId: number) { + this.tagSelectionModel.toggle(tagId) } toggleCorrespondent(correspondentId: number) { + this.correspondentSelectionModel.toggle(correspondentId) } toggleDocumentType(documentTypeId: number) { + this.documentTypeSelectionModel.toggle(documentTypeId) } } From 08beaf81d56a8130a49657db70e2bdb6b5bdd2dc Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Mon, 28 Dec 2020 12:03:30 +0100 Subject: [PATCH 75/92] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 7f3808905..eea41ce05 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,6 @@ Paperless has been around a while now, and people are starting to build stuff on These projects also exist, but their status and compatibility with paperless-ng is unknown. * [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation. Runs on Mac, Linux, and Windows. -* [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible. * [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance. # Important Note From e2bea3aee38366011c49ca1e8ea04ab6a51b2ca1 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 12:29:34 +0100 Subject: [PATCH 76/92] add missing index task --- src/documents/bulk_edit.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py index beb9c50f7..c2dc438bc 100644 --- a/src/documents/bulk_edit.py +++ b/src/documents/bulk_edit.py @@ -106,6 +106,10 @@ def modify_tags(doc_ids, add_tags, remove_tags): document_id=doc, tag_id=tag) for (doc,tag) in itertools.product(affected_docs, add_tags) ], ignore_conflicts=True) + async_task( + "documents.tasks.bulk_index_documents", + document_ids=affected_docs + ) async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) return "OK" From e228e18f04c11e92c0ef9beba1321aacbf31568f Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 12:29:53 +0100 Subject: [PATCH 77/92] it must have been late when I tried to do this --- src/documents/serialisers.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 155030a68..1f33b957c 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -236,6 +236,15 @@ class BulkEditSerializer(serializers.Serializer): raise serializers.ValidationError( f"Some documents in {name} don't exist or were specified twice.") + def _validate_tag_id_list(self, tags, name="tags"): + if not type(tags) == list: + raise serializers.ValidationError(f"{name} must be a list") + if not all([type(i) == int for i in tags]): + raise serializers.ValidationError(f"{name} must be a list of integers") + count = Tag.objects.filter(id__in=tags).count() + if not count == len(tags): + raise serializers.ValidationError( + f"Some tags in {name} don't exist or were specified twice.") def validate_documents(self, documents): self._validate_document_id_list(documents) @@ -296,12 +305,12 @@ class BulkEditSerializer(serializers.Serializer): def _validate_parameters_modify_tags(self, parameters): if "add_tags" in parameters: - self._validate_document_id_list(parameters['add_tags'], "add_tags") + self._validate_tag_id_list(parameters['add_tags'], "add_tags") else: raise serializers.ValidationError("add_tags not specified") if "remove_tags" in parameters: - self._validate_document_id_list(parameters['remove_tags'], "remove_tags") + self._validate_tag_id_list(parameters['remove_tags'], "remove_tags") else: raise serializers.ValidationError("remove_tags not specified") From 9e311241b313844a50989c3b1aee9d01087374ba Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 12:31:14 +0100 Subject: [PATCH 78/92] rename some stuff --- src-ui/src/app/services/rest/document.service.ts | 9 ++++----- src/documents/views.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts index 9caaecdb2..c42510270 100644 --- a/src-ui/src/app/services/rest/document.service.ts +++ b/src-ui/src/app/services/rest/document.service.ts @@ -28,9 +28,9 @@ export interface SelectionDataItem { } export interface SelectionData { - correspondents: SelectionDataItem[] - tags: SelectionDataItem[] - document_types: SelectionDataItem[] + selected_correspondents: SelectionDataItem[] + selected_tags: SelectionDataItem[] + selected_document_types: SelectionDataItem[] } @Injectable({ @@ -125,8 +125,7 @@ export class DocumentService extends AbstractPaperlessService }) } - selectionData(ids: number[]): Observable { - console.log(ids) + getSelectionData(ids: number[]): Observable { return this.http.post(this.getResourceUrl(null, 'selection_data'), {"documents": ids}) } diff --git a/src/documents/views.py b/src/documents/views.py index a50896057..ddf02f534 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -420,7 +420,7 @@ class SelectionDataView(APIView): "id": t.id, "document_count": t.document_count } for t in tags], - "selected_types": [{ + "selected_document_types": [{ "id": t.id, "document_count": t.document_count } for t in types] From bd02c789663221eb34ff3dacbe5d40b0405d5848 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 12:31:30 +0100 Subject: [PATCH 79/92] fix the filter pipe --- src-ui/src/app/pipes/filter.pipe.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts index a982e9019..8465f1533 100644 --- a/src-ui/src/app/pipes/filter.pipe.ts +++ b/src-ui/src/app/pipes/filter.pipe.ts @@ -1,17 +1,18 @@ import { Pipe, PipeTransform } from '@angular/core'; import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; +import { MatchingModel } from '../data/matching-model'; @Pipe({ name: 'filter' }) export class FilterPipe implements PipeTransform { - transform(toggleableItems: ToggleableItem[], searchText: string): any[] { - if (!toggleableItems) return []; - if (!searchText) return toggleableItems; + transform(items: MatchingModel[], searchText: string): any[] { + if (!items) return []; + if (!searchText) return items; - return toggleableItems.filter(toggleableItem => { - return Object.keys(toggleableItem.item).some(key => { - return String(toggleableItem.item[key]).toLowerCase().includes(searchText.toLowerCase()); + return items.filter(item => { + return Object.keys(item).some(key => { + return String(item[key]).toLowerCase().includes(searchText.toLowerCase()); }); }); } From 544ca8d0082325d23276c7164e3af07d0f67ccd7 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 12:31:50 +0100 Subject: [PATCH 80/92] add ability to manually clear the cache on matching models --- .../app/services/rest/abstract-paperless-service.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts index f57956754..8ad1a2141 100644 --- a/src-ui/src/app/services/rest/abstract-paperless-service.ts +++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts @@ -74,27 +74,31 @@ export abstract class AbstractPaperlessService { ) } + clearCache() { + this._listAll = null + } + get(id: number): Observable { return this.http.get(this.getResourceUrl(id)) } create(o: T): Observable { - this._listAll = null + this.clearCache() return this.http.post(this.getResourceUrl(), o) } delete(o: T): Observable { - this._listAll = null + this.clearCache() return this.http.delete(this.getResourceUrl(o.id)) } update(o: T): Observable { - this._listAll = null + this.clearCache() return this.http.put(this.getResourceUrl(o.id), o) } patch(o: T): Observable { - this._listAll = null + this.clearCache() return this.http.patch(this.getResourceUrl(o.id), o) } From 527c533958e14d5ab83b99c8d08b6a553cde1ec0 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 12:32:21 +0100 Subject: [PATCH 81/92] improve performance of the toggle dropdown button --- .../toggleable-dropdown-button.component.html | 14 +++++++++++--- .../toggleable-dropdown-button.component.ts | 15 +++++++-------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html index 5b58025d1..404ea9d4d 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html @@ -1,8 +1,16 @@
-
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 4365e00b0..36577bc6f 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -1,26 +1,19 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component } from '@angular/core'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; -import { ObjectWithId } from 'src/app/data/object-with-id'; import { PaperlessTag } from 'src/app/data/paperless-tag'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; -import { PaperlessDocument } from 'src/app/data/paperless-document'; import { TagService } from 'src/app/services/rest/tag.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { DocumentService } from 'src/app/services/rest/document.service'; +import { DocumentService, SelectionDataItem } from 'src/app/services/rest/document.service'; import { OpenDocumentsService } from 'src/app/services/open-documents.service'; -import { FilterableDropdownType } from 'src/app/components/common/filterable-dropdown/filterable-dropdown.component'; import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component'; -import { ToggleableItem, ToggleableItemState } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; - -export interface ChangedItems { - itemsToAdd: any[], - itemsToRemove: any[] -} +import { ChangedItems, FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component'; +import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; @Component({ selector: 'app-bulk-editor', @@ -33,69 +26,15 @@ export class BulkEditorComponent { correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] - private initialTagsToggleableItems: ToggleableItem[] - private initialCorrespondentsToggleableItems: ToggleableItem[] - private initialDocumentTypesToggleableItems: ToggleableItem[] - - dropdownTypes = FilterableDropdownType - - private _tagsToggleableItems: ToggleableItem[] - get tagsToggleableItems(): ToggleableItem[] { - let tagsToggleableItems = [] - let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id)) - - this.tags?.forEach(t => { - let selectedDocumentsWithTag: PaperlessDocument[] = selectedDocuments.filter(d => d.tags.includes(t.id)) - let state = ToggleableItemState.NotSelected - if (selectedDocuments.length > 0 && selectedDocumentsWithTag.length == selectedDocuments.length) state = ToggleableItemState.Selected - else if (selectedDocumentsWithTag.length > 0 && selectedDocumentsWithTag.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - tagsToggleableItems.push({item: t, state: state, count: selectedDocumentsWithTag.length}) - }) - this._tagsToggleableItems = tagsToggleableItems - return tagsToggleableItems - } - - private _correspondentsToggleableItems: ToggleableItem[] - get correspondentsToggleableItems(): ToggleableItem[] { - let correspondentsToggleableItems = [] - let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id)) - - this.correspondents?.forEach(c => { - let selectedDocumentsWithCorrespondent: PaperlessDocument[] = selectedDocuments.filter(d => d.correspondent == c.id) - let state = ToggleableItemState.NotSelected - if (selectedDocuments.length > 0 && selectedDocumentsWithCorrespondent.length == selectedDocuments.length) state = ToggleableItemState.Selected - else if (selectedDocumentsWithCorrespondent.length > 0 && selectedDocumentsWithCorrespondent.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - correspondentsToggleableItems.push({item: c, state: state, count: selectedDocumentsWithCorrespondent.length}) - }) - this._correspondentsToggleableItems = correspondentsToggleableItems - return correspondentsToggleableItems - } - - private _documentTypesToggleableItems: ToggleableItem[] - get documentTypesToggleableItems(): ToggleableItem[] { - let documentTypesToggleableItems = [] - let selectedDocuments: PaperlessDocument[] = this.documentList.documents.filter(d => this.documentList.selected.has(d.id)) - - this.documentTypes?.forEach(dt => { - let selectedDocumentsWithDocumentType: PaperlessDocument[] = selectedDocuments.filter(d => d.document_type == dt.id) - let state = ToggleableItemState.NotSelected - if (selectedDocuments.length > 0 && selectedDocumentsWithDocumentType.length == selectedDocuments.length) state = ToggleableItemState.Selected - else if (selectedDocumentsWithDocumentType.length > 0 && selectedDocumentsWithDocumentType.length < selectedDocuments.length) state = ToggleableItemState.PartiallySelected - documentTypesToggleableItems.push({item: dt, state: state, count: selectedDocumentsWithDocumentType.length}) - }) - this._documentTypesToggleableItems = documentTypesToggleableItems - return documentTypesToggleableItems - } - - get documentList(): DocumentListViewService { - return this.documentListViewService - } + tagSelectionModel = new FilterableDropdownSelectionModel() + correspondentSelectionModel = new FilterableDropdownSelectionModel() + documentTypeSelectionModel = new FilterableDropdownSelectionModel() constructor( private documentTypeService: DocumentTypeService, private tagService: TagService, private correspondentService: CorrespondentService, - private documentListViewService: DocumentListViewService, + public list: DocumentListViewService, private documentService: DocumentService, private modalService: NgbModal, private openDocumentService: OpenDocumentsService @@ -107,97 +46,69 @@ export class BulkEditorComponent { this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results) } - tagsDropdownOpen() { - this.initialTagsToggleableItems = this._tagsToggleableItems - } - - correspondentsDropdownOpen() { - this.initialCorrespondentsToggleableItems = this._correspondentsToggleableItems - } - - documentTypesDropdownOpen() { - this.initialDocumentTypesToggleableItems = this._documentTypesToggleableItems - } - - private checkForChangedItems(toggleableItemsA: ToggleableItem[], toggleableItemsB: ToggleableItem[]): ChangedItems { - let itemsToAdd: any[] = [] - let itemsToRemove: any[] = [] - toggleableItemsA.forEach(oldItem => { - let newItem = toggleableItemsB.find(nTTI => nTTI.item.id == oldItem.item.id) - - if (newItem.state == ToggleableItemState.Selected && (oldItem.state == ToggleableItemState.PartiallySelected || oldItem.state == ToggleableItemState.NotSelected)) itemsToAdd.push(newItem.item) - else if (newItem.state == ToggleableItemState.NotSelected && (oldItem.state == ToggleableItemState.Selected || oldItem.state == ToggleableItemState.PartiallySelected)) itemsToRemove.push(newItem.item) - }) - return { itemsToAdd: itemsToAdd, itemsToRemove: itemsToRemove } - } - private executeBulkOperation(method: string, args): Observable { - return this.documentService.bulkEdit(Array.from(this.documentList.selected), method, args).pipe( + return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe( tap(() => { - this.documentList.reload() - this.documentList.selected.forEach(id => { + this.list.reload() + this.list.selected.forEach(id => { this.openDocumentService.refreshDocument(id) }) - this.documentList.selectNone() + this.list.selectNone() }) ) } - setTags(newTagsToggleableItems: ToggleableItem[]) { - let changedTags: ChangedItems - if (newTagsToggleableItems) { - changedTags = this.checkForChangedItems(this.initialTagsToggleableItems, newTagsToggleableItems) - if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return - } + private applySelectionData(items: SelectionDataItem[], selectionModel: FilterableDropdownSelectionModel) { + let selectionData = new Map() + items.forEach(i => { + if (i.document_count == this.list.selected.size) { + selectionData.set(i.id, ToggleableItemState.Selected) + } else if (i.document_count > 0) { + selectionData.set(i.id, ToggleableItemState.PartiallySelected) + } + }) + selectionModel.init(selectionData) + } - let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) - modal.componentInstance.title = "Confirm Tags Assignment" - let action = 'set_tags' - let tags - let messageFragment = '' - let both = changedTags && changedTags.itemsToAdd.length > 0 && changedTags.itemsToRemove.length > 0 - if (!changedTags) { - messageFragment = `remove all tags from` - } else { - if (changedTags.itemsToAdd.length > 0) { - tags = changedTags.itemsToAdd - messageFragment = `assign the tag(s) ${changedTags.itemsToAdd.map(t => t.name).join(', ')} to` - } - if (changedTags.itemsToRemove.length > 0) { - if (!both) { - action = 'remove_tags' - tags = changedTags.itemsToRemove - } else { - messageFragment += ' and ' - } - messageFragment += `remove the tag(s) ${changedTags.itemsToRemove.map(t => t.name).join(', ')} from` - } - } - modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).` - modal.componentInstance.btnClass = "btn-warning" - modal.componentInstance.btnCaption = "Confirm" - modal.componentInstance.confirmClicked.subscribe(() => { - // TODO: API endpoints for add/remove multiple tags - this.executeBulkOperation(action, {"tags": tags ? tags.map(t => t.id) : null}).subscribe( - response => { - if (!both) modal.close() - else { - this.executeBulkOperation('remove_tags', {"tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe( - response => { - modal.close() - }) - } - } - ) + openTagsDropdown() { + this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => { + this.applySelectionData(s.selected_tags, this.tagSelectionModel) }) } - setCorrespondents(newCorrespondentsToggleableItems: ToggleableItem[]) { - let changedCorrespondents: ChangedItems - if (newCorrespondentsToggleableItems) { - changedCorrespondents = this.checkForChangedItems(this.initialCorrespondentsToggleableItems, newCorrespondentsToggleableItems) - if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return - } + openDocumentTypeDropdown() { + this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => { + this.applySelectionData(s.selected_document_types, this.documentTypeSelectionModel) + }) + } + + openCorrespondentDropdown() { + this.documentService.getSelectionData(Array.from(this.list.selected)).subscribe(s => { + this.applySelectionData(s.selected_correspondents, this.correspondentSelectionModel) + }) + } + + setTags(changedTags: ChangedItems) { + if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 0) return + + let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) + modal.componentInstance.title = "Confirm Tags Assignment" + + modal.componentInstance.message = `This operation will modify some tags on all ${this.list.selected.size} selected document(s).` + modal.componentInstance.btnClass = "btn-warning" + modal.componentInstance.btnCaption = "Confirm" + modal.componentInstance.confirmClicked.subscribe(() => { + this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe( + response => { + this.tagService.clearCache() + modal.close() + }) + } + ) + } + + setCorrespondents(changedCorrespondents: ChangedItems) { + if (changedCorrespondents.itemsToAdd.length == 0 && changedCorrespondents.itemsToRemove.length == 0) return let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Correspondent Assignment" @@ -207,24 +118,21 @@ export class BulkEditorComponent { correspondent = changedCorrespondents.itemsToAdd[0] messageFragment = `assign the correspondent ${correspondent.name} to` } - modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).` + modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe( response => { + this.correspondentService.clearCache() modal.close() } ) }) } - setDocumentTypes(newDocumentTypesToggleableItems: ToggleableItem[]) { - let changedDocumentTypes: ChangedItems - if (newDocumentTypesToggleableItems) { - changedDocumentTypes = this.checkForChangedItems(this.initialDocumentTypesToggleableItems, newDocumentTypesToggleableItems) - if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return - } + setDocumentTypes(changedDocumentTypes: ChangedItems) { + if (changedDocumentTypes.itemsToAdd.length == 0 && changedDocumentTypes.itemsToRemove.length == 0) return let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = "Confirm Document Type Assignment" @@ -234,12 +142,13 @@ export class BulkEditorComponent { documentType = changedDocumentTypes.itemsToAdd[0] messageFragment = `assign the document type ${documentType.name} to` } - modal.componentInstance.message = `This operation will ${messageFragment} all ${this.documentList.selected.size} selected document(s).` + modal.componentInstance.message = `This operation will ${messageFragment} all ${this.list.selected.size} selected document(s).` modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = "Confirm" modal.componentInstance.confirmClicked.subscribe(() => { this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe( response => { + this.documentService.clearCache() modal.close() } ) @@ -250,7 +159,7 @@ export class BulkEditorComponent { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.delayConfirm(5) modal.componentInstance.title = "Delete confirm" - modal.componentInstance.messageBold = `This operation will permanently delete all ${this.documentList.selected.size} selected document(s).` + modal.componentInstance.messageBold = `This operation will permanently delete all ${this.list.selected.size} selected document(s).` modal.componentInstance.message = `This operation cannot be undone.` modal.componentInstance.btnClass = "btn-danger" modal.componentInstance.btnCaption = "Delete document(s)" From 7beb8a09299696e1e83cf6241f249f3b67943833 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 12:48:41 +0100 Subject: [PATCH 84/92] fix enter select --- .../filterable-dropdown.component.ts | 20 +++++++++++-------- src-ui/src/app/pipes/filter.pipe.ts | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 8fb2d25d9..e06f0d638 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -196,7 +196,9 @@ export class FilterableDropdownComponent { setTimeout(() => { this.listFilterTextInput.nativeElement.focus(); }, 0) - this.selectionModel.reset() + if (this.editing) { + this.selectionModel.reset() + } this.open.next() } else { this.filterText = '' @@ -204,12 +206,14 @@ export class FilterableDropdownComponent { } listFilterEnter(): void { - // let filtered = this.filterPipe.transform(this.toggleableItems, this.filterText) - // if (filtered.length == 1) { - // let toggleableItem = this.toggleableItems.find(ti => ti.item.id == filtered[0].item.id) - // if (toggleableItem) toggleableItem.state = ToggleableItemState.Selected - // this.toggleItem(filtered[0]) - // this.dropdown.close() - // } + let filtered = this.filterPipe.transform(this.items, this.filterText) + if (filtered.length == 1) { + this.selectionModel.toggle(filtered[0].id) + if (this.editing) { + this.applyClicked() + } else { + this.dropdown.close() + } + } } } diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts index 8465f1533..d83ccc07a 100644 --- a/src-ui/src/app/pipes/filter.pipe.ts +++ b/src-ui/src/app/pipes/filter.pipe.ts @@ -6,7 +6,7 @@ import { MatchingModel } from '../data/matching-model'; name: 'filter' }) export class FilterPipe implements PipeTransform { - transform(items: MatchingModel[], searchText: string): any[] { + transform(items: MatchingModel[], searchText: string): MatchingModel[] { if (!items) return []; if (!searchText) return items; From 3d173a13ab8706a57ae0985461857c556a6992f4 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 13:31:22 +0100 Subject: [PATCH 85/92] move the two post bulk edit tasks into one --- src/documents/bulk_edit.py | 29 ++++------------------- src/documents/tasks.py | 9 ++------ src/documents/tests/test_api.py | 41 ++++++++++++++++++--------------- 3 files changed, 30 insertions(+), 49 deletions(-) diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py index c2dc438bc..18168a164 100644 --- a/src/documents/bulk_edit.py +++ b/src/documents/bulk_edit.py @@ -18,11 +18,7 @@ def set_correspondent(doc_ids, correspondent): qs.update(correspondent=correspondent) async_task( - "documents.tasks.bulk_index_documents", - document_ids=affected_docs - ) - - async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) + "documents.tasks.bulk_update_documents", document_ids=affected_docs) return "OK" @@ -37,11 +33,7 @@ def set_document_type(doc_ids, document_type): qs.update(document_type=document_type) async_task( - "documents.tasks.bulk_index_documents", - document_ids=affected_docs - ) - - async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) + "documents.tasks.bulk_update_documents", document_ids=affected_docs) return "OK" @@ -59,11 +51,7 @@ def add_tag(doc_ids, tag): ]) async_task( - "documents.tasks.bulk_index_documents", - document_ids=affected_docs - ) - - async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) + "documents.tasks.bulk_update_documents", document_ids=affected_docs) return "OK" @@ -81,11 +69,7 @@ def remove_tag(doc_ids, tag): ).delete() async_task( - "documents.tasks.bulk_index_documents", - document_ids=affected_docs - ) - - async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) + "documents.tasks.bulk_update_documents", document_ids=affected_docs) return "OK" @@ -107,10 +91,7 @@ def modify_tags(doc_ids, add_tags, remove_tags): ], ignore_conflicts=True) async_task( - "documents.tasks.bulk_index_documents", - document_ids=affected_docs - ) - async_task("documents.tasks.bulk_rename_files", document_ids=affected_docs) + "documents.tasks.bulk_update_documents", document_ids=affected_docs) return "OK" diff --git a/src/documents/tasks.py b/src/documents/tasks.py index c1f3ffbaa..f9937c177 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -90,16 +90,11 @@ def sanity_check(): return "No issues detected." -def bulk_rename_files(document_ids): - qs = Document.objects.filter(id__in=document_ids) - for doc in qs: - post_save.send(Document, instance=doc, created=False) - - -def bulk_index_documents(document_ids): +def bulk_update_documents(document_ids): documents = Document.objects.filter(id__in=document_ids) ix = index.open_index() with AsyncWriter(ix) as writer: for doc in documents: index.update_document(writer, doc) + post_save.send(Document, instance=doc, created=False) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index a9c855ff7..adc947a1a 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -699,49 +699,49 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1) bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], self.c2.id) self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 3) - self.assertEqual(self.async_task.call_count, 2) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id]) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id]) + self.async_task.assert_called_once() + args, kwargs = self.async_task.call_args + self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id]) def test_unset_correspondent(self): self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1) bulk_edit.set_correspondent([self.doc1.id, self.doc2.id, self.doc3.id], None) self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 0) - self.assertEqual(self.async_task.call_count, 2) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id]) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id]) + self.async_task.assert_called_once() + args, kwargs = self.async_task.call_args + self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id]) def test_set_document_type(self): self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1) bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], self.dt2.id) self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 3) - self.assertEqual(self.async_task.call_count, 2) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id]) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc2.id]) + self.async_task.assert_called_once() + args, kwargs = self.async_task.call_args + self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc2.id]) def test_unset_document_type(self): self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 1) bulk_edit.set_document_type([self.doc1.id, self.doc2.id, self.doc3.id], None) self.assertEqual(Document.objects.filter(document_type=self.dt2).count(), 0) - self.assertEqual(self.async_task.call_count, 2) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id]) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc2.id, self.doc3.id]) + self.async_task.assert_called_once() + args, kwargs = self.async_task.call_args + self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id]) def test_add_tag(self): self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2) bulk_edit.add_tag([self.doc1.id, self.doc2.id, self.doc3.id, self.doc4.id], self.t1.id) self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 4) - self.assertEqual(self.async_task.call_count, 2) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc3.id]) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc1.id, self.doc3.id]) + self.async_task.assert_called_once() + args, kwargs = self.async_task.call_args + self.assertCountEqual(kwargs['document_ids'], [self.doc1.id, self.doc3.id]) def test_remove_tag(self): self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2) bulk_edit.remove_tag([self.doc1.id, self.doc3.id, self.doc4.id], self.t1.id) self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 1) - self.assertEqual(self.async_task.call_count, 2) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc4.id]) - self.assertCountEqual(self.async_task.call_args_list[0][1]['document_ids'], [self.doc4.id]) + self.async_task.assert_called_once() + args, kwargs = self.async_task.call_args + self.assertCountEqual(kwargs['document_ids'], [self.doc4.id]) def test_modify_tags(self): tag_unrelated = Tag.objects.create(name="unrelated") @@ -752,6 +752,11 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): self.assertCountEqual(list(self.doc2.tags.all()), [self.t2, tag_unrelated]) self.assertCountEqual(list(self.doc3.tags.all()), [self.t2, tag_unrelated]) + self.async_task.assert_called_once() + args, kwargs = self.async_task.call_args + # TODO: doc3 should not be affected, but the query for that is rather complicated + self.assertCountEqual(kwargs['document_ids'], [self.doc2.id, self.doc3.id]) + def test_delete(self): self.assertEqual(Document.objects.count(), 5) bulk_edit.delete([self.doc1.id, self.doc2.id]) From aa6e96e54d6a29ef5a8ea5478457cc63515ec456 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 13:33:58 +0100 Subject: [PATCH 86/92] fix pycodestyle --- src/documents/bulk_edit.py | 6 +++--- src/documents/serialisers.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py index 18168a164..c0c80a795 100644 --- a/src/documents/bulk_edit.py +++ b/src/documents/bulk_edit.py @@ -85,9 +85,9 @@ def modify_tags(doc_ids, add_tags, remove_tags): tag_id__in=remove_tags, ).delete() - DocumentTagRelationship.objects.bulk_create([ - DocumentTagRelationship( - document_id=doc, tag_id=tag) for (doc,tag) in itertools.product(affected_docs, add_tags) + DocumentTagRelationship.objects.bulk_create([DocumentTagRelationship( + document_id=doc, tag_id=tag) for (doc, tag) in itertools.product( + affected_docs, add_tags) ], ignore_conflicts=True) async_task( diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 1f33b957c..66f5f883f 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -230,17 +230,20 @@ class BulkEditSerializer(serializers.Serializer): if not type(documents) == list: raise serializers.ValidationError(f"{name} must be a list") if not all([type(i) == int for i in documents]): - raise serializers.ValidationError(f"{name} must be a list of integers") + raise serializers.ValidationError( + f"{name} must be a list of integers") count = Document.objects.filter(id__in=documents).count() if not count == len(documents): raise serializers.ValidationError( - f"Some documents in {name} don't exist or were specified twice.") + f"Some documents in {name} don't exist or were " + f"specified twice.") def _validate_tag_id_list(self, tags, name="tags"): if not type(tags) == list: raise serializers.ValidationError(f"{name} must be a list") if not all([type(i) == int for i in tags]): - raise serializers.ValidationError(f"{name} must be a list of integers") + raise serializers.ValidationError( + f"{name} must be a list of integers") count = Tag.objects.filter(id__in=tags).count() if not count == len(tags): raise serializers.ValidationError( @@ -310,7 +313,8 @@ class BulkEditSerializer(serializers.Serializer): raise serializers.ValidationError("add_tags not specified") if "remove_tags" in parameters: - self._validate_tag_id_list(parameters['remove_tags'], "remove_tags") + self._validate_tag_id_list(parameters['remove_tags'], + "remove_tags") else: raise serializers.ValidationError("remove_tags not specified") From d6e733c56f8724b95189011fd383829d830eb2df Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 15:39:53 +0100 Subject: [PATCH 87/92] add more localization tags #123 --- .../confirm-dialog/confirm-dialog.component.ts | 4 ++-- .../date-dropdown/date-dropdown.component.html | 8 ++++---- .../filterable-dropdown.component.html | 2 +- .../select-dialog/select-dialog.component.html | 4 ++-- .../select-dialog/select-dialog.component.ts | 4 ++-- .../metadata-collapse.component.ts | 2 +- .../bulk-editor/bulk-editor.component.html | 16 ++++++---------- .../document-list/document-list.component.html | 10 +++++----- .../filter-editor/filter-editor.component.html | 18 +++++++++--------- .../filter-editor/filter-editor.component.ts | 6 +++--- 10 files changed, 35 insertions(+), 39 deletions(-) diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts index 4791d0e77..c397811a4 100644 --- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts +++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts @@ -14,7 +14,7 @@ export class ConfirmDialogComponent implements OnInit { public confirmClicked = new EventEmitter() @Input() - title = "Confirmation" + title = $localize`Confirmation` @Input() messageBold @@ -26,7 +26,7 @@ export class ConfirmDialogComponent implements OnInit { btnClass = "btn-primary" @Input() - btnCaption = "Confirm" + btnCaption = $localize`Confirm` confirmButtonEnabled = true seconds = 0 diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index ba9f1fafb..e4f17c4e6 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -10,12 +10,12 @@
- - + +
\ No newline at end of file diff --git a/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts b/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts index 76b23491c..99bf9b91a 100644 --- a/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts +++ b/src-ui/src/app/components/common/select-dialog/select-dialog.component.ts @@ -15,10 +15,10 @@ export class SelectDialogComponent implements OnInit { public selectClicked = new EventEmitter() @Input() - title = "Select" + title = $localize`Select` @Input() - message = "Please select an object" + message = $localize`Please select an object` @Input() objects: ObjectWithId[] = [] diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts index 160274e41..34bbbd655 100644 --- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts +++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts @@ -15,7 +15,7 @@ export class MetadataCollapseComponent implements OnInit { metadata @Input() - title = "Metadata" + title = $localize`Metadata` ngOnInit(): void { } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index c78f3ea3e..e08d50c47 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -3,32 +3,29 @@
- +
- + - - Delete +  Delete
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 b5539a1e5..40a08c105 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 @@ -4,13 +4,13 @@
- - - + + +
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index f029275eb..27a16edfd 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -1,18 +1,18 @@
- - + +
- - - - - + + + + +
@@ -20,8 +20,8 @@
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index f881dc1d9..14a88c10b 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -25,13 +25,13 @@ export class FilterEditorComponent implements OnInit, OnDestroy { switch(this.filterRules[0].rule_type) { case FILTER_CORRESPONDENT: - return `Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}` + return $localize`Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}` case FILTER_DOCUMENT_TYPE: - return `Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}` + return $localize`Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}` case FILTER_HAS_TAG: - return `Tag: ${this.tags.find(t => t.id == +rule.value)?.name}` + return $localize`Tag: ${this.tags.find(t => t.id == +rule.value)?.name}` } } From 27ae4f6b1e2e6dc7e0444c9881086ca7f2cca380 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 15:48:35 +0100 Subject: [PATCH 88/92] fixes #197 --- docker/local/Dockerfile | 1 + docs/setup.rst | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 461b9e4fc..b66b814ff 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -9,6 +9,7 @@ RUN apt-get update \ && apt-get -y --no-install-recommends install \ build-essential \ curl \ + fonts-liberation \ ghostscript \ gnupg \ icc-profiles-free \ diff --git a/docs/setup.rst b/docs/setup.rst index 4d29ce640..437409194 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -221,8 +221,9 @@ writing. Windows is not and will never be supported. * ``python3-pip``, optionally ``pipenv`` for package installation * ``python3-dev`` + * ``fonts-liberation`` for generating thumbnails for plain text files * ``imagemagick`` >= 6 for PDF conversion - * ``optipng`` for optimising thumbnails + * ``optipng`` for optimizing thumbnails * ``gnupg`` for handling encrypted documents * ``libpoppler-cpp-dev`` for PDF to text conversion * ``libmagic-dev`` for mime type detection @@ -242,8 +243,7 @@ writing. Windows is not and will never be supported. * ``tesseract-ocr`` language packs (``tesseract-ocr-eng``, ``tesseract-ocr-deu``, etc) You will also need ``build-essential``, ``python3-setuptools`` and ``python3-wheel`` - for installing some of the python dependencies. You can remove that - again after installation. + for installing some of the python dependencies. 2. Install ``redis`` >= 5.0 and configure it to start automatically. From 6d4aa76405c2292dd7c236b54ca54bc06f468b10 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 15:59:06 +0100 Subject: [PATCH 89/92] fixes #196 --- src/documents/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/documents/views.py b/src/documents/views.py index ddf02f534..32b88a18f 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -5,6 +5,7 @@ from time import mktime from django.conf import settings from django.db.models import Count, Max, Case, When, IntegerField +from django.db.models.functions import Lower from django.http import HttpResponse, HttpResponseBadRequest, Http404 from django.views.decorators.cache import cache_control from django.views.generic import TemplateView @@ -68,7 +69,7 @@ class CorrespondentViewSet(ModelViewSet): queryset = Correspondent.objects.annotate( document_count=Count('documents'), - last_correspondence=Max('documents__created')).order_by('name') + last_correspondence=Max('documents__created')).order_by(Lower('name')) serializer_class = CorrespondentSerializer pagination_class = StandardPagination @@ -87,7 +88,7 @@ class TagViewSet(ModelViewSet): model = Tag queryset = Tag.objects.annotate( - document_count=Count('documents')).order_by('name') + document_count=Count('documents')).order_by(Lower('name')) serializer_class = TagSerializer pagination_class = StandardPagination @@ -101,7 +102,7 @@ class DocumentTypeViewSet(ModelViewSet): model = DocumentType queryset = DocumentType.objects.annotate( - document_count=Count('documents')).order_by('name') + document_count=Count('documents')).order_by(Lower('name')) serializer_class = DocumentTypeSerializer pagination_class = StandardPagination From 1de7a490b4f1114fdc8fd7523da4ed4e0ce4c85f Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Mon, 28 Dec 2020 17:04:53 +0100 Subject: [PATCH 90/92] #186 allow filtering for documents with no correspondents / tags / types --- .../filterable-dropdown.component.html | 2 +- .../filterable-dropdown.component.ts | 23 ++++++++++++++++++- .../filter-editor.component.html | 6 ++--- .../filter-editor/filter-editor.component.ts | 16 ++++++++----- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 48e0dfd97..7215faa79 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -21,7 +21,7 @@
- +