From 2bbeb8ffe0d212eab0542e218fb6358bb2579be1 Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Sun, 6 Dec 2020 23:30:51 +0100 Subject: [PATCH 01/78] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd6080d35..a8fb1f8e9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,3 +24,7 @@ feature-X branches is for experimental stuff that will eventually be merged into I'm trying to get most of paperless tested, so please do the same for your code! I know its a hassle, but it makes sure that your code works now and will allow us to detect regressions easily. To test your code, execute `pytest` in the src/ directory. Executing that in the project root is no good. This also generates a html coverage report, which you can use to see if you missed anything important during testing. + +## More info: + +... is available in the documentation. https://paperless-ng.readthedocs.io/en/latest/extending.html From 72706a335da809122c886576f50df4528c15c75f Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Sun, 6 Dec 2020 23:30:51 +0100 Subject: [PATCH 02/78] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd6080d35..a8fb1f8e9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,3 +24,7 @@ feature-X branches is for experimental stuff that will eventually be merged into I'm trying to get most of paperless tested, so please do the same for your code! I know its a hassle, but it makes sure that your code works now and will allow us to detect regressions easily. To test your code, execute `pytest` in the src/ directory. Executing that in the project root is no good. This also generates a html coverage report, which you can use to see if you missed anything important during testing. + +## More info: + +... is available in the documentation. https://paperless-ng.readthedocs.io/en/latest/extending.html From f3fd0fcf72f8009e9b67cf18319e37100a97f0bb Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 8 Dec 2020 23:08:02 -0800 Subject: [PATCH 03/78] Basic tags, correspondents & document type dropdowns --- src-ui/src/app/app.module.ts | 4 +- .../document-list.component.html | 69 +++++++++++++++++-- .../document-list/document-list.component.ts | 30 ++++++-- src-ui/src/app/pipes/filter.pipe.ts | 17 +++++ 4 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 src-ui/src/app/pipes/filter.pipe.ts diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index ad12c9c47..af2c46492 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -48,6 +48,7 @@ import { WidgetFrameComponent } from './components/dashboard/widgets/widget-fram import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component'; import { YesNoPipe } from './pipes/yes-no.pipe'; import { FileSizePipe } from './pipes/file-size.pipe'; +import { FilterPipe } from './pipes/filter.pipe'; @NgModule({ declarations: [ @@ -88,7 +89,8 @@ import { FileSizePipe } from './pipes/file-size.pipe'; WidgetFrameComponent, WelcomeWidgetComponent, YesNoPipe, - FileSizePipe + FileSizePipe, + FilterPipe ], imports: [ BrowserModule, 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 8608ed92b..886b5832a 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,5 +1,4 @@ -
+
@@ -42,13 +42,14 @@
+
@@ -58,18 +59,69 @@
- +
+ +
+
+
+ +
+
+ + + + +
+
+
+ +
+ +
+
+ + + + +
+
+
+ +
+ +
+
+ + + + +
+
+
+ +
+
+
-
Filter
+
Advanced Filters
@@ -125,5 +177,12 @@
- +
+ + 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 09e73dd96..9870f3dc1 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,6 +11,12 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi import { Toast, ToastService } from 'src/app/services/toast.service'; import { environment } from 'src/environments/environment'; 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'; +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'; @Component({ selector: 'app-document-list', @@ -25,13 +31,20 @@ export class DocumentListComponent implements OnInit { public route: ActivatedRoute, private toastService: ToastService, public modalService: NgbModal, - private titleService: Title) { } + private titleService: Title, + private tagService: TagService, + private correspondentService: CorrespondentService, + private documentTypeService: DocumentTypeService) { } displayMode = 'smallCards' // largeCards, smallCards, details filterRules: FilterRule[] = [] showFilter = false + tags: PaperlessTag[] = [] + correspondents: PaperlessCorrespondent[] = [] + documentTypes: PaperlessDocumentType[] = [] + get isFiltered() { return this.list.filterRules?.length > 0 } @@ -67,6 +80,9 @@ export class DocumentListComponent implements OnInit { this.list.clear() this.list.reload() }) + 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) } applyFilterRules() { @@ -103,8 +119,8 @@ export class DocumentListComponent implements OnInit { }) } - filterByTag(tag_id: number) { - let filterRules = this.list.filterRules + filterByTag(tag_id: number, singleton: boolean = false) { + let filterRules = singleton ? [] : this.list.filterRules if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) { return } @@ -114,8 +130,8 @@ export class DocumentListComponent implements OnInit { this.applyFilterRules() } - filterByCorrespondent(correspondent_id: number) { - let filterRules = this.list.filterRules + filterByCorrespondent(correspondent_id: number, singleton: boolean = false) { + let filterRules = singleton ? [] : this.list.filterRules let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT) if (existing_rule && existing_rule.value == correspondent_id) { return @@ -128,8 +144,8 @@ export class DocumentListComponent implements OnInit { this.applyFilterRules() } - filterByDocumentType(document_type_id: number) { - let filterRules = this.list.filterRules + filterByDocumentType(document_type_id: number, singleton: boolean = false) { + let filterRules = singleton ? [] : this.list.filterRules let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE) if (existing_rule && existing_rule.value == document_type_id) { return diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts new file mode 100644 index 000000000..f799f40cc --- /dev/null +++ b/src-ui/src/app/pipes/filter.pipe.ts @@ -0,0 +1,17 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'filter' +}) +export class FilterPipe implements PipeTransform { + transform(items: any[], searchText: string): any[] { + if (!items) return []; + if (!searchText) return items; + + return items.filter(item => { + return Object.keys(item).some(key => { + return String(item[key]).toLowerCase().includes(searchText.toLowerCase()); + }); + }); + } +} From 23ba3be68ff56f54abe8bba430d8fafa8ee25840 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 8 Dec 2020 23:39:38 -0800 Subject: [PATCH 04/78] Toggling of items --- .../document-list.component.html | 15 ++++- .../document-list/document-list.component.ts | 64 +++++++++++++++++-- 2 files changed, 70 insertions(+), 9 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 886b5832a..7c89517be 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,10 @@
- @@ -92,7 +95,10 @@
- @@ -107,7 +113,10 @@
- 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 9870f3dc1..5e5134dc7 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 @@ -119,8 +119,8 @@ export class DocumentListComponent implements OnInit { }) } - filterByTag(tag_id: number, singleton: boolean = false) { - let filterRules = singleton ? [] : this.list.filterRules + filterByTag(tag_id: number) { + let filterRules = this.list.filterRules if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) { return } @@ -130,8 +130,8 @@ export class DocumentListComponent implements OnInit { this.applyFilterRules() } - filterByCorrespondent(correspondent_id: number, singleton: boolean = false) { - let filterRules = singleton ? [] : this.list.filterRules + filterByCorrespondent(correspondent_id: number) { + let filterRules = this.list.filterRules let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT) if (existing_rule && existing_rule.value == correspondent_id) { return @@ -144,8 +144,8 @@ export class DocumentListComponent implements OnInit { this.applyFilterRules() } - filterByDocumentType(document_type_id: number, singleton: boolean = false) { - let filterRules = singleton ? [] : this.list.filterRules + filterByDocumentType(document_type_id: number) { + let filterRules = this.list.filterRules let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE) if (existing_rule && existing_rule.value == document_type_id) { return @@ -158,4 +158,56 @@ export class DocumentListComponent implements OnInit { this.applyFilterRules() } + findRuleIndex(type_id: number, value: any) { + return this.list.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value) + } + + toggleFilterByTag(tag_id: number) { + let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id) + if (existingRuleIndex !== -1) { + let filterRules = this.list.filterRules + filterRules.splice(existingRuleIndex, 1) + this.filterRules = filterRules + this.applyFilterRules() + } else { + this.filterByTag(tag_id) + } + } + + toggleFilterByCorrespondent(correspondent_id: number) { + let existingRuleIndex = this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) + if (existingRuleIndex !== -1) { + let filterRules = this.list.filterRules + filterRules.splice(existingRuleIndex, 1) + this.filterRules = filterRules + this.applyFilterRules() + } else { + this.filterByCorrespondent(correspondent_id) + } + } + + toggleFilterByDocumentType(document_type_id: number) { + let existingRuleIndex = this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) + if (existingRuleIndex !== -1) { + let filterRules = this.list.filterRules + filterRules.splice(existingRuleIndex, 1) + this.filterRules = filterRules + this.applyFilterRules() + } else { + this.filterByDocumentType(document_type_id) + } + } + + currentViewIncludesTag(tag_id: number) { + return this.findRuleIndex(FILTER_HAS_TAG, tag_id) !== -1 + } + + currentViewIncludesCorrespondent(correspondent_id: number) { + return this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) !== -1 + } + + currentViewIncludesDocumentType(document_type_id: number) { + return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1 + } + } From da87542a5204db3244f2c270ac1ee82394110d71 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 8 Dec 2020 23:53:19 -0800 Subject: [PATCH 05/78] Change advanced to show / hide --- .../components/document-list/document-list.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 7c89517be..58fbbcbe8 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 @@ -49,13 +49,13 @@ - Advanced Filters + {{ showFilter ? 'Hide' : 'Show' }} Filter Editor
- +
@@ -69,7 +69,7 @@ -
+
@@ -130,7 +130,7 @@
-
Advanced Filters
+
Filter Editor
From c28f19c9cfbcda0acd34a50ed5d28c74eb3ae974 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 8 Dec 2020 23:53:56 -0800 Subject: [PATCH 06/78] Quick filter styling --- .../components/document-list/document-list.component.html | 6 +++--- .../components/document-list/document-list.component.scss | 4 ++++ 2 files changed, 7 insertions(+), 3 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 58fbbcbe8..f94c2be2c 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 @@ -73,7 +73,7 @@
-
+
@@ -91,7 +91,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
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 e69de29bb..2d6fc29ef 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 @@ -0,0 +1,4 @@ +.quick-filter { + min-width: 250px; + max-height: 400px; +} From 06a3fff2bc41edfe9b1bc204e0e09d95ce2fb963 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Tue, 8 Dec 2020 23:56:27 -0800 Subject: [PATCH 07/78] Refactor clashing filter variable --- .../document-list/document-list.component.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 f94c2be2c..672f7c9af 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 @@ -75,9 +75,9 @@
- - -
- - -
- - -
From 0f635d1bb2f51e6bbbe20cc4a00ec43e7ab9cfc2 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 9 Dec 2020 00:40:23 -0800 Subject: [PATCH 09/78] Clear button & visual tweaks --- .../document-list.component.html | 49 ++++++++++++------- .../document-list.component.scss | 5 ++ .../document-list/document-list.component.ts | 9 +++- 3 files changed, 44 insertions(+), 19 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 586ef8cfb..c0f2332b4 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,12 +78,14 @@
-
@@ -96,12 +98,14 @@
-
@@ -114,18 +118,27 @@
-
+ +
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 2d6fc29ef..ee3736d3d 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 @@ -1,4 +1,9 @@ .quick-filter { min-width: 250px; max-height: 400px; + + .selected-icon { + min-width: 1em; + min-height: 1em; + } } 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 5e5134dc7..22ee6ca2d 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 @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -17,6 +17,7 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; 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 { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component'; @Component({ selector: 'app-document-list', @@ -45,6 +46,8 @@ export class DocumentListComponent implements OnInit { correspondents: PaperlessCorrespondent[] = [] documentTypes: PaperlessDocumentType[] = [] + @ViewChild(FilterEditorComponent) filterEditor; + get isFiltered() { return this.list.filterRules?.length > 0 } @@ -210,4 +213,8 @@ export class DocumentListComponent implements OnInit { return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1 } + currentViewIncludesQuickFilter() { + return this.list.filterRules.find(rule => rule.type.id == FILTER_HAS_TAG || rule.type.id == FILTER_CORRESPONDENT || rule.type.id == FILTER_DOCUMENT_TYPE) !== undefined + } + } From 4fbb814e5bf822a624446911583fb4b1e26239c1 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 9 Dec 2020 01:25:04 -0800 Subject: [PATCH 10/78] Visual tweaks --- .../components/document-list/document-list.component.html | 6 +++--- .../components/document-list/document-list.component.scss | 3 ++- .../app/components/document-list/document-list.component.ts | 3 +++ 3 files changed, 8 insertions(+), 4 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 c0f2332b4..03ce515cd 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 @@ -84,7 +84,7 @@
-
{{tag.name}}
+
{{tag.name}}
{{tag.document_count}}
 @@ -104,7 +104,7 @@
-
{{correspondent.name}}
+
{{correspondent.name}}
{{correspondent.document_count}}
@@ -124,7 +124,7 @@
-
{{documentType.name}}
+
{{documentType.name}}
{{documentType.document_count}}
 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 ee3736d3d..2513a1adc 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 @@ -1,7 +1,8 @@ .quick-filter { min-width: 250px; max-height: 400px; - + overflow-y: scroll; + .selected-icon { min-width: 1em; min-height: 1em; 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 22ee6ca2d..91ccfb082 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 @@ -45,6 +45,9 @@ export class DocumentListComponent implements OnInit { tags: PaperlessTag[] = [] correspondents: PaperlessCorrespondent[] = [] documentTypes: PaperlessDocumentType[] = [] + filterTagsText: string + filterCorrespondentsText: string + filterDocumentTypesText: string @ViewChild(FilterEditorComponent) filterEditor; From a4f7c5ddcb77028bc95cc5b80adde837f0ef2cb6 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 9 Dec 2020 01:34:09 -0800 Subject: [PATCH 11/78] Unused test code --- .../components/document-list/document-list.component.html | 7 ------- 1 file changed, 7 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 03ce515cd..767d207ae 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 @@ -202,10 +202,3 @@
- - From ed236460b5bd0d3e2cd0f2de342ae547e90e4931 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 9 Dec 2020 01:36:33 -0800 Subject: [PATCH 12/78] Fix document type search field placeholder --- .../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 767d207ae..e36aa3571 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 @@ -116,7 +116,7 @@
- + From fa5121082de93cb0971304d887cdb05a4bce81be Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 9 Dec 2020 23:12:51 -0800 Subject: [PATCH 14/78] Moved quick filters to filter editor --- .../document-list.component.html | 85 +----------- .../document-list.component.scss | 10 -- .../document-list/document-list.component.ts | 82 +----------- .../filter-editor.component.html | 123 +++++++++++------- .../filter-editor.component.scss | 10 ++ .../filter-editor/filter-editor.component.ts | 69 +++++++++- 6 files changed, 154 insertions(+), 225 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 96e13f935..13e1718ce 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 @@ -45,15 +45,8 @@
- -
- +
@@ -69,82 +62,8 @@ -
-
- Quick Filters: -
- -
-
- - - - -
-
-
- -
- -
-
- - - - -
-
-
- -
- -
-
- - - - -
-
-
- - - -
-
- -
+
-
Filter Editor
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 2513a1adc..e69de29bb 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 @@ -1,10 +0,0 @@ -.quick-filter { - min-width: 250px; - max-height: 400px; - overflow-y: scroll; - - .selected-icon { - min-width: 1em; - min-height: 1em; - } -} 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 91ccfb082..d6b7c1d29 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 @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -14,9 +14,6 @@ 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 { 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 { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component'; @Component({ @@ -32,25 +29,12 @@ export class DocumentListComponent implements OnInit { public route: ActivatedRoute, private toastService: ToastService, public modalService: NgbModal, - private titleService: Title, - private tagService: TagService, - private correspondentService: CorrespondentService, - private documentTypeService: DocumentTypeService) { } + private titleService: Title) { } displayMode = 'smallCards' // largeCards, smallCards, details filterRules: FilterRule[] = [] - showFilter = false - tags: PaperlessTag[] = [] - correspondents: PaperlessCorrespondent[] = [] - documentTypes: PaperlessDocumentType[] = [] - filterTagsText: string - filterCorrespondentsText: string - filterDocumentTypesText: string - - @ViewChild(FilterEditorComponent) filterEditor; - get isFiltered() { return this.list.filterRules?.length > 0 } @@ -75,20 +59,15 @@ export class DocumentListComponent implements OnInit { if (params.has('id')) { this.list.savedView = this.savedViewConfigService.getConfig(params.get('id')) this.filterRules = this.list.filterRules - this.showFilter = false this.titleService.setTitle(`${this.list.savedView.title} - ${environment.appTitle}`) } else { this.list.savedView = null this.filterRules = this.list.filterRules - this.showFilter = this.filterRules.length > 0 this.titleService.setTitle(`Documents - ${environment.appTitle}`) } this.list.clear() this.list.reload() }) - 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) } applyFilterRules() { @@ -97,7 +76,6 @@ export class DocumentListComponent implements OnInit { clearFilterRules() { this.list.filterRules = this.filterRules - this.showFilter = false } loadViewConfig(config: SavedViewConfig) { @@ -164,60 +142,4 @@ export class DocumentListComponent implements OnInit { this.applyFilterRules() } - findRuleIndex(type_id: number, value: any) { - return this.list.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value) - } - - toggleFilterByTag(tag_id: number) { - let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id) - if (existingRuleIndex !== -1) { - let filterRules = this.list.filterRules - filterRules.splice(existingRuleIndex, 1) - this.filterRules = filterRules - this.applyFilterRules() - } else { - this.filterByTag(tag_id) - } - } - - toggleFilterByCorrespondent(correspondent_id: number) { - let existingRuleIndex = this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) - if (existingRuleIndex !== -1) { - let filterRules = this.list.filterRules - filterRules.splice(existingRuleIndex, 1) - this.filterRules = filterRules - this.applyFilterRules() - } else { - this.filterByCorrespondent(correspondent_id) - } - } - - toggleFilterByDocumentType(document_type_id: number) { - let existingRuleIndex = this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) - if (existingRuleIndex !== -1) { - let filterRules = this.list.filterRules - filterRules.splice(existingRuleIndex, 1) - this.filterRules = filterRules - this.applyFilterRules() - } else { - this.filterByDocumentType(document_type_id) - } - } - - currentViewIncludesTag(tag_id: number) { - return this.findRuleIndex(FILTER_HAS_TAG, tag_id) !== -1 - } - - currentViewIncludesCorrespondent(correspondent_id: number) { - return this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) !== -1 - } - - currentViewIncludesDocumentType(document_type_id: number) { - return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1 - } - - currentViewIncludesQuickFilter() { - return this.list.filterRules.find(rule => rule.type.id == FILTER_HAS_TAG || rule.type.id == FILTER_CORRESPONDENT || rule.type.id == FILTER_DOCUMENT_TYPE) !== undefined - } - } 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 48780e950..925b216bd 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,52 +1,83 @@ -
-
- {{rule.type.name}} +
+
+
Filter by:
- - - - - - - - - - - - +
-
- + +
+ +
+
+ + + + +
+
+
+ +
+ +
+
+ + + + +
+
+
+ +
+ +
+
+ + + + +
+
+
+ +
+ +
+ +
+
-
-
- -
-
- -
-
- -
-
- -
-
+ diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.scss b/src-ui/src/app/components/filter-editor/filter-editor.component.scss index e69de29bb..05df7b213 100644 --- a/src-ui/src/app/components/filter-editor/filter-editor.component.scss +++ b/src-ui/src/app/components/filter-editor/filter-editor.component.scss @@ -0,0 +1,10 @@ +.quick-filter { + min-width: 250px; + max-height: 400px; + overflow-y: scroll; + + .selected-icon { + min-width: 1em; + min-height: 1em; + } +} 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 b04127287..ac0133f16 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 @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FilterRule } from 'src/app/data/filter-rule'; -import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; +import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { PaperlessTag } from 'src/app/data/paperless-tag'; @@ -27,15 +27,16 @@ export class FilterEditorComponent implements OnInit { @Output() apply = new EventEmitter() - selectedRuleType: FilterRuleType = FILTER_RULE_TYPES[0] - correspondents: PaperlessCorrespondent[] = [] tags: PaperlessTag[] = [] documentTypes: PaperlessDocumentType[] = [] + filterTagsText: string + filterCorrespondentsText: string + filterDocumentTypesText: string + newRuleClicked() { this.filterRules.push({type: this.selectedRuleType, value: this.selectedRuleType.default}) - this.selectedRuleType = this.getRuleTypes().length > 0 ? this.getRuleTypes()[0] : null } removeRuleClicked(rule) { @@ -54,14 +55,70 @@ export class FilterEditorComponent implements OnInit { this.clear.next() } + hasFilters() { + return this.filterRules.length > 0 + } + ngOnInit(): void { this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results}) this.tagService.listAll().subscribe(result => this.tags = result.results) this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results) } - getRuleTypes() { - return FILTER_RULE_TYPES.filter(rt => rt.multi || !this.filterRules.find(r => r.type == rt)) + findRuleIndex(type_id: number, value: any) { + return this.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value) + } + + toggleFilterByTag(tag_id: number) { + let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id) + if (existingRuleIndex !== -1) { + let filterRules = this.filterRules + filterRules.splice(existingRuleIndex, 1) + this.filterRules = filterRules + this.applyFilterRules() + } else { + this.filterByTag(tag_id) + } + } + + toggleFilterByCorrespondent(correspondent_id: number) { + let existingRuleIndex = this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) + if (existingRuleIndex !== -1) { + let filterRules = this.filterRules + filterRules.splice(existingRuleIndex, 1) + this.filterRules = filterRules + this.applyFilterRules() + } else { + this.filterByCorrespondent(correspondent_id) + } + } + + toggleFilterByDocumentType(document_type_id: number) { + let existingRuleIndex = this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) + if (existingRuleIndex !== -1) { + let filterRules = this.filterRules + filterRules.splice(existingRuleIndex, 1) + this.filterRules = filterRules + this.applyFilterRules() + } else { + this.filterByDocumentType(document_type_id) + } + } + + currentViewIncludesTag(tag_id: number) { + return this.findRuleIndex(FILTER_HAS_TAG, tag_id) !== -1 + } + + currentViewIncludesCorrespondent(correspondent_id: number) { + return this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) !== -1 + } + + currentViewIncludesDocumentType(document_type_id: number) { + return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1 + } + + currentViewIncludesQuickFilter() { + return this.filterRules.find(rule => rule.type.id == FILTER_HAS_TAG || rule.type.id == FILTER_CORRESPONDENT || rule.type.id == FILTER_DOCUMENT_TYPE) !== undefined } } From ab8a1cfded4c442965991f90c1639368b9dd70e0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 10 Dec 2020 00:46:13 -0800 Subject: [PATCH 15/78] Working moved dropdowns --- .../document-list/document-list.component.ts | 45 +-------------- .../filter-editor.component.html | 14 ++--- .../filter-editor/filter-editor.component.ts | 55 ++++++++----------- 3 files changed, 33 insertions(+), 81 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 d6b7c1d29..3fb933fb7 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,10 +11,6 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi import { Toast, ToastService } from 'src/app/services/toast.service'; import { environment } from 'src/environments/environment'; 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'; -import { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component'; @Component({ selector: 'app-document-list', @@ -71,6 +67,8 @@ export class DocumentListComponent implements OnInit { } applyFilterRules() { + console.log('applyFilterRules'); + this.list.filterRules = this.filterRules } @@ -103,43 +101,4 @@ export class DocumentListComponent implements OnInit { }) } - filterByTag(tag_id: number) { - let filterRules = this.list.filterRules - if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) { - return - } - - filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id}) - this.filterRules = filterRules - this.applyFilterRules() - } - - filterByCorrespondent(correspondent_id: number) { - let filterRules = this.list.filterRules - let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT) - if (existing_rule && existing_rule.value == correspondent_id) { - return - } else if (existing_rule) { - existing_rule.value = correspondent_id - } else { - filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id}) - } - this.filterRules = filterRules - this.applyFilterRules() - } - - filterByDocumentType(document_type_id: number) { - let filterRules = this.list.filterRules - let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE) - if (existing_rule && existing_rule.value == document_type_id) { - return - } else if (existing_rule) { - existing_rule.value = document_type_id - } else { - filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id}) - } - this.filterRules = filterRules - this.applyFilterRules() - } - } 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 925b216bd..756110d13 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 @@ -73,11 +73,11 @@
-
- + +
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 ac0133f16..f4dc7162b 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 @@ -35,22 +35,11 @@ export class FilterEditorComponent implements OnInit { filterCorrespondentsText: string filterDocumentTypesText: string - newRuleClicked() { - this.filterRules.push({type: this.selectedRuleType, value: this.selectedRuleType.default}) - } - - removeRuleClicked(rule) { - let index = this.filterRules.findIndex(r => r == rule) - if (index > -1) { - this.filterRules.splice(index, 1) - } - } - - applyClicked() { + applySelected() { this.apply.next() } - clearClicked() { + clearSelected() { this.filterRules.splice(0,this.filterRules.length) this.clear.next() } @@ -71,38 +60,42 @@ export class FilterEditorComponent implements OnInit { toggleFilterByTag(tag_id: number) { let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id) + let filterRules = this.filterRules if (existingRuleIndex !== -1) { - let filterRules = this.filterRules filterRules.splice(existingRuleIndex, 1) - this.filterRules = filterRules - this.applyFilterRules() } else { - this.filterByTag(tag_id) + filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id}) } + this.filterRules = filterRules + this.applySelected() } toggleFilterByCorrespondent(correspondent_id: number) { - let existingRuleIndex = this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) - if (existingRuleIndex !== -1) { - let filterRules = this.filterRules - filterRules.splice(existingRuleIndex, 1) - this.filterRules = filterRules - this.applyFilterRules() + let filterRules = this.filterRules + let existingRule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT) + if (existingRule && existingRule.value == correspondent_id) { + return + } else if (existingRule) { + existingRule.value = correspondent_id } else { - this.filterByCorrespondent(correspondent_id) + filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id}) } + this.filterRules = filterRules + this.applySelected() } toggleFilterByDocumentType(document_type_id: number) { - let existingRuleIndex = this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) - if (existingRuleIndex !== -1) { - let filterRules = this.filterRules - filterRules.splice(existingRuleIndex, 1) - this.filterRules = filterRules - this.applyFilterRules() + let filterRules = this.filterRules + let existingRule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE) + if (existingRule && existingRule.value == document_type_id) { + return + } else if (existingRule) { + existingRule.value = document_type_id } else { - this.filterByDocumentType(document_type_id) + filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id}) } + this.filterRules = filterRules + this.applySelected() } currentViewIncludesTag(tag_id: number) { From 25e1177198eb6d62c3af0b0b2d7edea16c4432b5 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 10 Dec 2020 01:42:40 -0800 Subject: [PATCH 16/78] Title filtering --- .../document-list/document-list.component.ts | 2 - .../filter-editor.component.html | 2 +- .../filter-editor/filter-editor.component.ts | 48 +++++++++++++++++-- 3 files changed, 45 insertions(+), 7 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 3fb933fb7..3ce00beab 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 @@ -67,8 +67,6 @@ export class DocumentListComponent implements OnInit { } applyFilterRules() { - console.log('applyFilterRules'); - this.list.filterRules = this.filterRules } 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 756110d13..586e23a98 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 @@ -3,7 +3,7 @@
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 f4dc7162b..e470a8400 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 @@ -1,20 +1,21 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, ViewChild } from '@angular/core'; import { FilterRule } from 'src/app/data/filter-rule'; -import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; +import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { PaperlessTag } from 'src/app/data/paperless-tag'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { TagService } from 'src/app/services/rest/tag.service'; - +import { fromEvent } from 'rxjs'; +import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators'; @Component({ selector: 'app-filter-editor', templateUrl: './filter-editor.component.html', styleUrls: ['./filter-editor.component.scss'] }) -export class FilterEditorComponent implements OnInit { +export class FilterEditorComponent implements OnInit, AfterViewInit { constructor(private documentTypeService: DocumentTypeService, private tagService: TagService, private correspondentService: CorrespondentService) { } @@ -27,10 +28,13 @@ export class FilterEditorComponent implements OnInit { @Output() apply = new EventEmitter() + @ViewChild('filterTextInput') input: ElementRef; + correspondents: PaperlessCorrespondent[] = [] tags: PaperlessTag[] = [] documentTypes: PaperlessDocumentType[] = [] + filterText: string filterTagsText: string filterCorrespondentsText: string filterDocumentTypesText: string @@ -41,6 +45,7 @@ export class FilterEditorComponent implements OnInit { clearSelected() { this.filterRules.splice(0,this.filterRules.length) + this.updateTextFilterInput() this.clear.next() } @@ -52,12 +57,47 @@ export class FilterEditorComponent implements OnInit { this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results}) this.tagService.listAll().subscribe(result => this.tags = result.results) this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results) + this.updateTextFilterInput() + } + + ngAfterViewInit() { + fromEvent(this.input.nativeElement,'keyup') + .pipe( + debounceTime(150), + distinctUntilChanged(), + tap() + ) + .subscribe(event => { + this.filterText = event.target.value + this.onTextFilterInput() + }); } findRuleIndex(type_id: number, value: any) { return this.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value) } + updateTextFilterInput() { + let existingTextRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE) + if (existingTextRule) this.filterText = existingTextRule.value + else this.filterText = '' + } + + onTextFilterInput(event) { + let text = this.filterText + let filterRules = this.filterRules + let existingRule = filterRules.find(rule => rule.type.id == FILTER_TITLE) + if (existingRule && existingRule.value == text) { + return + } else if (existingRule) { + existingRule.value = text + } else { + filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: text}) + } + this.filterRules = filterRules + this.applySelected() + } + toggleFilterByTag(tag_id: number) { let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id) let filterRules = this.filterRules From 3a82b7806ac229b7c943de4b6aa02ec023ad863b Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Thu, 10 Dec 2020 16:28:02 +0100 Subject: [PATCH 17/78] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e754669a8..41f85af19 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Here's what you get: # Features * Performs OCR on your documents, adds selectable text to image only documents and adds tags, correspondents and document types to your documents. +* Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and can be configured freely. * Single page application front end. Should be pretty snappy. Will be mobile friendly in the future. * Includes a dashboard that shows basic statistics and has document upload. * Filtering by tags, correspondents, types, and more. From edcb62476bdc2683066089c35e35290be8e6c9cb Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 10 Dec 2020 09:13:26 -0800 Subject: [PATCH 18/78] Remove clear button outline --- .../app/components/filter-editor/filter-editor.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 586e23a98..5e2077116 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 @@ -74,7 +74,7 @@
- +
+
+ + + + +
+
+
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 new file mode 100644 index 000000000..05df7b213 --- /dev/null +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.scss @@ -0,0 +1,10 @@ +.quick-filter { + min-width: 250px; + max-height: 400px; + overflow-y: scroll; + + .selected-icon { + min-width: 1em; + min-height: 1em; + } +} diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts new file mode 100644 index 000000000..29edd7c45 --- /dev/null +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FilterDropodownComponent } from './filter-dropdown.component'; + +describe('FilterDropodownComponent', () => { + let component: FilterDropodownComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ FilterDropodownComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(FilterDropodownComponent); + 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/filter-editor/filter-dropdown/filter-dropdown.component.ts new file mode 100644 index 000000000..443fd30e4 --- /dev/null +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts @@ -0,0 +1,34 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; +import { ObjectWithId } from 'src/app/data/object-with-id'; +import { MatchingModel } from 'src/app/data/matching-model'; + +@Component({ + selector: 'app-filter-dropdown', + templateUrl: './filter-dropdown.component.html', + styleUrls: ['./filter-dropdown.component.scss'] +}) +export class FilterDropdownComponent implements OnInit { + + constructor() { } + + @Input() + filterRuleTypeID: number + + @Output() + toggle = new EventEmitter() + + items: MatchingModel[] = [] + itemsActive: MatchingModel[] = [] + title: string + filterText: string + + ngOnInit(): void { + let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == this.filterRuleTypeID) + this.title = filterRuleType.name + } + + toggleItem(item: ObjectWithId) { + this.toggle.emit(item, this.filterRuleTypeID) + } +} 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 5e2077116..153f32644 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 @@ -6,65 +6,10 @@
-
- -
-
- - - - -
-
-
- -
- -
-
- - - - -
-
-
- -
- -
-
- - - - -
-
-
+ +
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 ac89d9b88..b79fbaf12 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 @@ -1,12 +1,15 @@ -import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core'; import { FilterRule } from 'src/app/data/filter-rule'; -import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; +import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { PaperlessTag } from 'src/app/data/paperless-tag'; +import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service'; +import { ObjectWithId } from 'src/app/data/object-with-id'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { TagService } from 'src/app/services/rest/tag.service'; +import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component' import { fromEvent } from 'rxjs'; import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators'; @@ -29,6 +32,9 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { apply = new EventEmitter() @ViewChild('filterTextInput') input: ElementRef; + @ViewChildren(FilterDropdownComponent) quickFilterDropdowns!: QueryList; + + quickFilterRuleTypeIDs: number[] = [FILTER_HAS_TAG, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE] correspondents: PaperlessCorrespondent[] = [] tags: PaperlessTag[] = [] @@ -39,25 +45,11 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { filterCorrespondentsText: string filterDocumentTypesText: string - applySelected() { - this.apply.next() - } - - clearSelected() { - this.filterRules.splice(0,this.filterRules.length) - this.updateTextFilterInput() - this.clear.next() - } - - hasFilters() { - return this.filterRules.length > 0 - } - ngOnInit(): void { - this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results}) - this.tagService.listAll().subscribe(result => this.tags = result.results) - this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results) this.updateTextFilterInput() + this.tagService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_HAS_TAG)) + this.correspondentService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_CORRESPONDENT)) + this.documentTypeService.listAll().subscribe(result => this.setDropdownItems(result.results, FILTER_DOCUMENT_TYPE)) } ngAfterViewInit() { @@ -73,8 +65,29 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { }); } - findRuleIndex(type_id: number, value: any) { - return this.filterRules.findIndex(rule => rule.type.id == type_id && rule.value == value) + setDropdownItems(items: ObjectWithId[], filterRuleTypeID: number) { + let dropdown: FilterDropdownComponent = this.getDropdownByFilterRuleTypeID(filterRuleTypeID) + if (dropdown) { + dropdown.items = items + } + } + + getDropdownByFilterRuleTypeID(filterRuleTypeID: number): FilterDropdownComponent { + return this.quickFilterDropdowns.find(d => d.filterRuleTypeID == filterRuleTypeID) + } + + applySelected() { + this.apply.next() + } + + clearSelected() { + this.filterRules.splice(0,this.filterRules.length) + this.updateTextFilterInput() + this.clear.next() + } + + hasFilters() { + return this.filterRules.length > 0 } updateTextFilterInput() { @@ -98,60 +111,22 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { this.applySelected() } - toggleFilterByTag(tag_id: number) { - let existingRuleIndex = this.findRuleIndex(FILTER_HAS_TAG, tag_id) + toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) { let filterRules = this.filterRules - if (existingRuleIndex !== -1) { - filterRules.splice(existingRuleIndex, 1) - } else { - filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id}) - } - this.filterRules = filterRules - this.applySelected() - } + let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID) + let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id) - toggleFilterByCorrespondent(correspondent_id: number) { - let filterRules = this.filterRules - let existingRule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT) - if (existingRule && existingRule.value == correspondent_id) { + if (existingRule && existingRule.value == item.id && filterRuleType.id == FILTER_HAS_TAG) { + filterRules.splice(filterRules.indexOf(existingRule), 1) + } else if (existingRule && existingRule.value == item.id) { return } else if (existingRule) { - existingRule.value = correspondent_id + existingRule.value = item.id } else { - filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id}) + filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id}) } this.filterRules = filterRules this.applySelected() } - toggleFilterByDocumentType(document_type_id: number) { - let filterRules = this.filterRules - let existingRule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE) - if (existingRule && existingRule.value == document_type_id) { - return - } else if (existingRule) { - existingRule.value = document_type_id - } else { - filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id}) - } - this.filterRules = filterRules - this.applySelected() - } - - currentViewIncludesTag(tag_id: number) { - return this.findRuleIndex(FILTER_HAS_TAG, tag_id) !== -1 - } - - currentViewIncludesCorrespondent(correspondent_id: number) { - return this.findRuleIndex(FILTER_CORRESPONDENT, correspondent_id) !== -1 - } - - currentViewIncludesDocumentType(document_type_id: number) { - return this.findRuleIndex(FILTER_DOCUMENT_TYPE, document_type_id) !== -1 - } - - currentViewIncludesQuickFilter() { - return this.filterRules.find(rule => rule.type.id == FILTER_HAS_TAG || rule.type.id == FILTER_CORRESPONDENT || rule.type.id == FILTER_DOCUMENT_TYPE) !== undefined - } - } diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts index a35759f69..1a174ce57 100644 --- a/src-ui/src/app/data/filter-rule-type.ts +++ b/src-ui/src/app/data/filter-rule-type.ts @@ -22,15 +22,15 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ {id: FILTER_TITLE, name: "Title contains", filtervar: "title__icontains", datatype: "string", multi: false, default: ""}, {id: FILTER_CONTENT, name: "Content contains", filtervar: "content__icontains", datatype: "string", multi: false, default: ""}, - - {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_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}, - {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true}, + {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false}, + + {id: FILTER_CORRESPONDENT, name: "Correspondents", filtervar: "correspondent__id", datatype: "correspondent", multi: false}, + {id: FILTER_DOCUMENT_TYPE, name: "Document types", filtervar: "document_type__id", 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: "Tags", filtervar: "tags__id__all", datatype: "tag", multi: true}, + {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true}, {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true}, {id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false}, @@ -42,7 +42,7 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ {id: FILTER_ADDED_BEFORE, name: "Added before", filtervar: "added__date__lt", datatype: "date", multi: false}, {id: FILTER_ADDED_AFTER, name: "Added after", filtervar: "added__date__gt", datatype: "date", multi: false}, - + {id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false}, {id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false}, ] @@ -54,4 +54,4 @@ export interface FilterRuleType { datatype: string //number, string, boolean, date multi: boolean default?: any -} \ No newline at end of file +} From f83185bfe46f6a2b118cb05d39cffae931d1518e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 10 Dec 2020 15:36:17 -0800 Subject: [PATCH 21/78] Refactored dropdowns allow clearing, active checkmarks --- .../filter-dropdown.component.html | 2 +- .../filter-dropdown.component.ts | 7 +++---- .../filter-editor/filter-editor.component.ts | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) 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 b135caff0..4552406b1 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,6 @@
-
+
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 443fd30e4..070689bd2 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 @@ -1,7 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; import { ObjectWithId } from 'src/app/data/object-with-id'; -import { MatchingModel } from 'src/app/data/matching-model'; @Component({ selector: 'app-filter-dropdown', @@ -18,8 +17,8 @@ export class FilterDropdownComponent implements OnInit { @Output() toggle = new EventEmitter() - items: MatchingModel[] = [] - itemsActive: MatchingModel[] = [] + items: ObjectWithId[] = [] + itemsActive: ObjectWithId[] = [] title: string filterText: string @@ -29,6 +28,6 @@ export class FilterDropdownComponent implements OnInit { } toggleItem(item: ObjectWithId) { - this.toggle.emit(item, this.filterRuleTypeID) + this.toggle.emit(item) } } 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 b79fbaf12..d45732717 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 @@ -65,11 +65,21 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { }); } - setDropdownItems(items: ObjectWithId[], filterRuleTypeID: number) { + setDropdownItems(items: ObjectWithId[], filterRuleTypeID: number): void { let dropdown: FilterDropdownComponent = this.getDropdownByFilterRuleTypeID(filterRuleTypeID) if (dropdown) { dropdown.items = items } + this.updateDropdownActiveItems(dropdown) + } + + updateDropdownActiveItems(dropdown: FilterDropdownComponent): void { + let activeRulesValues = this.filterRules.filter(r => r.type.id == dropdown.filterRuleTypeID).map(r => r.value) + let activeItems = [] + if (activeRulesValues.length > 0) { + activeItems = dropdown.items.filter(i => activeRulesValues.includes(i.id)) + } + dropdown.itemsActive = activeItems } getDropdownByFilterRuleTypeID(filterRuleTypeID: number): FilterDropdownComponent { @@ -83,6 +93,7 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { clearSelected() { this.filterRules.splice(0,this.filterRules.length) this.updateTextFilterInput() + this.quickFilterDropdowns.forEach(d => this.updateDropdownActiveItems(d)) this.clear.next() } @@ -118,6 +129,8 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { if (existingRule && existingRule.value == item.id && filterRuleType.id == FILTER_HAS_TAG) { filterRules.splice(filterRules.indexOf(existingRule), 1) + } else if (existingRule && filterRuleType.id == FILTER_HAS_TAG) { + filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id}) } else if (existingRule && existingRule.value == item.id) { return } else if (existingRule) { @@ -125,6 +138,10 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { } else { filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id}) } + + let dropdown = this.getDropdownByFilterRuleTypeID(filterRuleTypeID) + this.updateDropdownActiveItems(dropdown) + this.filterRules = filterRules this.applySelected() } From 364df5c050c4be7fa72f9ef49bcfedf8869e050e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 10 Dec 2020 15:37:56 -0800 Subject: [PATCH 22/78] Fix toggling off active items --- .../app/components/filter-editor/filter-editor.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d45732717..d3e8eb244 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 @@ -127,9 +127,9 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID) let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id) - if (existingRule && existingRule.value == item.id && filterRuleType.id == FILTER_HAS_TAG) { + if (existingRule && existingRule.value == item.id) { filterRules.splice(filterRules.indexOf(existingRule), 1) - } else if (existingRule && filterRuleType.id == FILTER_HAS_TAG) { + } else if (existingRule && filterRuleType.id == FILTER_HAS_TAG) { filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id}) } else if (existingRule && existingRule.value == item.id) { return From 57504b7ee6c8acbda931c85674faa40684fbd132 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 10 Dec 2020 15:49:00 -0800 Subject: [PATCH 23/78] Display tags with color pills --- .../filter-dropdown/filter-dropdown.component.html | 5 ++++- .../filter-dropdown/filter-dropdown.component.ts | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) 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 4552406b1..0dc56db2e 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 @@ -10,7 +10,10 @@
-
{{item.name}}
+
+ + {{item.name}} +
{{item.document_count}}
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 070689bd2..1885884cd 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 @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { FilterRuleType, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; +import { FilterRuleType, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; import { ObjectWithId } from 'src/app/data/object-with-id'; @Component({ @@ -21,10 +21,12 @@ export class FilterDropdownComponent implements OnInit { itemsActive: ObjectWithId[] = [] title: string filterText: string + display: string ngOnInit(): void { let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == this.filterRuleTypeID) this.title = filterRuleType.name + this.display = filterRuleType.datatype } toggleItem(item: ObjectWithId) { From 4146955f4a7ed8ad0a2a6ddbcff15c9bbb7d871c Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 10 Dec 2020 15:51:11 -0800 Subject: [PATCH 24/78] Shadows! --- .../app/components/document-list/document-list.component.html | 2 +- .../filter-dropdown/filter-dropdown.component.html | 2 +- 2 files changed, 2 insertions(+), 2 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 13e1718ce..f8c3445c5 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 @@ -47,7 +47,7 @@
-
+
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 0dc56db2e..f3c3b020c 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,6 @@
-
+
From 66aa7319aba16860b980f6085abe50b5af3c201a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 11 Dec 2020 00:07:26 -0800 Subject: [PATCH 25/78] Small text --- .../filter-dropdown/filter-dropdown.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f3c3b020c..14d71a393 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 @@ -2,7 +2,7 @@
- + From ed480f62e3d67362c56e1a86dfa34c68dd03d132 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 11 Dec 2020 00:08:06 -0800 Subject: [PATCH 26/78] filter-rule-type displayName property --- .../filter-dropdown/filter-dropdown.component.ts | 4 ++-- src-ui/src/app/data/filter-rule-type.ts | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) 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 1885884cd..0522583c0 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 @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { FilterRuleType, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; +import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; import { ObjectWithId } from 'src/app/data/object-with-id'; @Component({ @@ -25,7 +25,7 @@ export class FilterDropdownComponent implements OnInit { ngOnInit(): void { let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == this.filterRuleTypeID) - this.title = filterRuleType.name + this.title = filterRuleType.displayName this.display = filterRuleType.datatype } diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts index 1a174ce57..cf155daf1 100644 --- a/src-ui/src/app/data/filter-rule-type.ts +++ b/src-ui/src/app/data/filter-rule-type.ts @@ -25,23 +25,23 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false}, - {id: FILTER_CORRESPONDENT, name: "Correspondents", filtervar: "correspondent__id", datatype: "correspondent", multi: false}, - {id: FILTER_DOCUMENT_TYPE, name: "Document types", filtervar: "document_type__id", datatype: "document_type", multi: false}, + {id: FILTER_CORRESPONDENT, name: "Correspondent is", displayName: "Correspondents", filtervar: "correspondent__id", datatype: "correspondent", multi: false}, + {id: FILTER_DOCUMENT_TYPE, name: "Document type is", displayName: "Document types", filtervar: "document_type__id", 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: "Tags", filtervar: "tags__id__all", datatype: "tag", multi: true}, + {id: FILTER_HAS_TAG, name: "Has tag", displayName: "Tags", filtervar: "tags__id__all", datatype: "tag", multi: true}, {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true}, {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true}, - {id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false}, - {id: FILTER_CREATED_AFTER, name: "Created after", filtervar: "created__date__gt", datatype: "date", multi: false}, + {id: FILTER_CREATED_BEFORE, name: "Created before", displayName: "Created", filtervar: "created__date__lt", datatype: "date", multi: false}, + {id: FILTER_CREATED_AFTER, name: "Created after", displayName: "Created", filtervar: "created__date__gt", datatype: "date", multi: false}, {id: FILTER_CREATED_YEAR, name: "Year created is", filtervar: "created__year", datatype: "number", multi: false}, {id: FILTER_CREATED_MONTH, name: "Month created is", filtervar: "created__month", datatype: "number", multi: false}, {id: FILTER_CREATED_DAY, name: "Day created is", filtervar: "created__day", datatype: "number", multi: false}, - {id: FILTER_ADDED_BEFORE, name: "Added before", filtervar: "added__date__lt", datatype: "date", multi: false}, - {id: FILTER_ADDED_AFTER, name: "Added after", filtervar: "added__date__gt", datatype: "date", multi: false}, + {id: FILTER_ADDED_BEFORE, name: "Added before", displayName: "Added", filtervar: "added__date__lt", datatype: "date", multi: false}, + {id: FILTER_ADDED_AFTER, name: "Added after", displayName: "Added", filtervar: "added__date__gt", datatype: "date", multi: false}, {id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false}, {id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false}, @@ -53,5 +53,6 @@ export interface FilterRuleType { filtervar: string datatype: string //number, string, boolean, date multi: boolean + displayName?: string default?: any } From c24bfd4d2bdf72ceed3393a338aca443e67cb695 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 11 Dec 2020 01:03:05 -0800 Subject: [PATCH 27/78] filter-dropdown-date rough implementation --- src-ui/src/app/app.module.ts | 2 + .../filter-dropdown-date.component.html | 41 ++++++++++++++ .../filter-dropdown-date.component.scss | 3 ++ .../filter-dropdown-date.component.spec.ts | 25 +++++++++ .../filter-dropdown-date.component.ts | 53 +++++++++++++++++++ .../filter-editor.component.html | 13 +---- .../filter-editor/filter-editor.component.ts | 7 +-- 7 files changed, 130 insertions(+), 14 deletions(-) create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts create mode 100644 src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 6a847494a..394e3ba58 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -29,6 +29,7 @@ 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 { FilterDropdownDateComponent } from './components/filter-editor/filter-dropdown/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 { NgxFileDropModule } from 'ngx-file-drop'; @@ -76,6 +77,7 @@ import { FilterPipe } from './pipes/filter.pipe'; ToastsComponent, FilterEditorComponent, FilterDropdownComponent, + FilterDropdownDateComponent, DocumentCardLargeComponent, DocumentCardSmallComponent, TextComponent, diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html new file mode 100644 index 000000000..74d508390 --- /dev/null +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html @@ -0,0 +1,41 @@ +
+ +
+
+
+ + + + +
+ + +
+
+
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss new file mode 100644 index 000000000..67edb9bf8 --- /dev/null +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.scss @@ -0,0 +1,3 @@ +.date-filter { + min-width: 250px; +} diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts new file mode 100644 index 000000000..6bf59e2e7 --- /dev/null +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.spec.ts @@ -0,0 +1,25 @@ +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-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts new file mode 100644 index 000000000..37ea2cd09 --- /dev/null +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts @@ -0,0 +1,53 @@ +import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core'; +import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; +import { ObjectWithId } from 'src/app/data/object-with-id'; +import { FilterDropdownComponent } from '../filter-dropdown.component' +import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'app-filter-dropdown-date', + templateUrl: './filter-dropdown-date.component.html', + styleUrls: ['./filter-dropdown-date.component.scss'] +}) +export class FilterDropdownDateComponent extends FilterDropdownComponent { + + @Input() + filterRuleTypeIDs: number[] = [] + + @Output() + selected = new EventEmitter() + + filterRuleTypes: FilterRuleType[] = [] + showYear: boolean = false + showMonth: boolean = false + dateAfter: NgbDateStruct + dateBefore: NgbDateStruct + + ngOnInit(): void { + this.filterRuleTypes = this.filterRuleTypeIDs.map(id => FILTER_RULE_TYPES.find(rt => rt.id == id)) + this.filterRuleTypeID = this.filterRuleTypeIDs[0] + super.ngOnInit() + + this.showYear = this.filterRuleTypes.find(rt => rt.filtervar.indexOf('year') > -1) !== undefined + this.showMonth = this.filterRuleTypes.find(rt => rt.filtervar.indexOf('month') > -1) !== undefined + } + + setQuickFilter(range: any) { + this.dateAfter = this.dateBefore = undefined + switch (typeof range) { + case 'number': + let date = new Date(); + date.setDate(date.getDate() - range) + this.dateAfter = { year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() } + break; + + case 'string': + let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(range) > -1) + console.log(range); + break; + + default: + break; + } + } +} 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 153f32644..d3473337b 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 @@ -6,18 +6,9 @@
- - + -
- -
- -
- -
+
- +
- - -
Download original
- +
@@ -66,10 +66,8 @@
- -

Your browser does not support PDFs. - Download the PDF.

- - +
+ +
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss index e69de29bb..b4d720018 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.scss +++ b/src-ui/src/app/components/document-detail/document-detail.component.scss @@ -0,0 +1,8 @@ +.pdf-viewer-container { + height: calc(100vh - 160px); + top: 70px; + position: sticky; + padding: 10px; + background-color: gray; + overflow-y: scroll; +} diff --git a/src-ui/src/app/pipes/safe.pipe.spec.ts b/src-ui/src/app/pipes/safe.pipe.spec.ts deleted file mode 100644 index 49ee0ad14..000000000 --- a/src-ui/src/app/pipes/safe.pipe.spec.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { SafePipe } from './safe.pipe'; - -describe('SafePipe', () => { - it('create an instance', () => { - const pipe = new SafePipe(); - expect(pipe).toBeTruthy(); - }); -}); diff --git a/src-ui/src/app/pipes/safe.pipe.ts b/src-ui/src/app/pipes/safe.pipe.ts deleted file mode 100644 index f2d77a72d..000000000 --- a/src-ui/src/app/pipes/safe.pipe.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { DomSanitizer } from '@angular/platform-browser'; - -@Pipe({ - name: 'safe' -}) -export class SafePipe implements PipeTransform { - - constructor(private sanitizer: DomSanitizer) { } - - transform(url) { - if (url == null) { - return this.sanitizer.bypassSecurityTrustResourceUrl("") - } else { - return this.sanitizer.bypassSecurityTrustResourceUrl(url); - } - } - -} \ No newline at end of file From e7cb35853615791b7f18aeff770b8fcb34abe43e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 11 Dec 2020 15:20:47 -0800 Subject: [PATCH 32/78] Fix broken card tags / correspondent links --- .../document-card-large.component.html | 4 ++-- .../document-card-small.component.html | 8 ++++---- .../document-list.component.html | 12 +++++------ .../document-list/document-list.component.ts | 20 ++++++++++++++++++- .../filter-editor/filter-editor.component.ts | 9 ++++++--- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index bfc59b526..430a76a23 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -7,7 +7,7 @@
-
+
{{(document.correspondent$ | async)?.name}} {{(document.correspondent$ | async)?.name}}: @@ -52,4 +52,4 @@
-
\ No newline at end of file +
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 95cf2e191..b2e7b0218 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 @@ -11,7 +11,7 @@
- +

@@ -44,7 +44,7 @@

{{document.created | date}}
- +
-
-
\ 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 f8c3445c5..a6ec1b741 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 @@ -64,7 +64,7 @@
- +
@@ -75,7 +75,7 @@
- +
@@ -95,16 +95,16 @@ - {{(d.correspondent$ | async)?.name}} + {{(d.correspondent$ | async)?.name}} {{d.title}} - + - {{(d.document_type$ | async)?.name}} + {{(d.document_type$ | async)?.name}} @@ -119,5 +119,5 @@
- +
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 3ce00beab..5bbd5b49d 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 @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -11,6 +11,10 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi import { Toast, ToastService } from 'src/app/services/toast.service'; import { environment } from 'src/environments/environment'; import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component'; +import { FilterEditorComponent } from './filter-editor/filter-editor.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', @@ -31,6 +35,8 @@ export class DocumentListComponent implements OnInit { filterRules: FilterRule[] = [] + @ViewChild('filterEditor') filterEditor: FilterEditorComponent + get isFiltered() { return this.list.filterRules?.length > 0 } @@ -99,4 +105,16 @@ export class DocumentListComponent implements OnInit { }) } + clickTag(tagID: number) { + this.filterEditor.toggleFilterByItem(tagID, FILTER_HAS_TAG) + } + + clickCorrespondent(correspondentID: number) { + this.filterEditor.toggleFilterByItem(correspondentID, FILTER_CORRESPONDENT) + } + + clickDocumentType(documentTypeID: number) { + this.filterEditor.toggleFilterByItem(documentTypeID, FILTER_DOCUMENT_TYPE) + } + } 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 93a91473f..b73b4387b 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 @@ -1,9 +1,9 @@ import { Component, EventEmitter, Input, OnInit, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core'; import { FilterRule } from 'src/app/data/filter-rule'; import { FilterRuleType, FILTER_RULE_TYPES, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER, FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY } from 'src/app/data/filter-rule-type'; +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 { PaperlessTag } from 'src/app/data/paperless-tag'; import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service'; import { ObjectWithId } from 'src/app/data/object-with-id'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; @@ -120,7 +120,11 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { this.applySelected() } - toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) { + toggleFilterByItem(item: any, filterRuleTypeID: number) { + let dropdown = this.getDropdownByFilterRuleTypeID(filterRuleTypeID) + if (typeof item == 'number') { + item = dropdown.items.find(i => i.id == item) + } let filterRules = this.filterRules let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID) let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id) @@ -137,7 +141,6 @@ export class FilterEditorComponent implements OnInit, AfterViewInit { filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id}) } - let dropdown = this.getDropdownByFilterRuleTypeID(filterRuleTypeID) this.updateDropdownActiveItems(dropdown) this.filterRules = filterRules From 9cd40e96f41100cf0056c5f2b7e912cf381ddc7f Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 12 Dec 2020 01:09:52 -0800 Subject: [PATCH 33/78] Working date filtering --- .../document-list/document-list.component.ts | 2 +- .../filter-dropdown-date.component.html | 12 ++++---- .../filter-dropdown-date.component.ts | 30 ++++++++++++------- .../filter-editor.component.html | 2 +- .../filter-editor/filter-editor.component.ts | 17 ++++++++++- 5 files changed, 43 insertions(+), 20 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 5bbd5b49d..271f6f7e5 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 { SavedViewConfigService } from 'src/app/services/saved-view-config.servi import { Toast, ToastService } from 'src/app/services/toast.service'; import { environment } from 'src/environments/environment'; import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component'; -import { FilterEditorComponent } from './filter-editor/filter-editor.component'; +import { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.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'; diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html index 74d508390..fb514d7df 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.html @@ -3,15 +3,15 @@
- - - - + + + +
- + {{item.name}}
{{item.document_count}}
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts index 847c3f12b..d3ddd3cbf 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-button/filter-dropdown-button.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +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'; @@ -8,22 +8,22 @@ import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; templateUrl: './filter-dropdown-button.component.html', styleUrls: ['./filter-dropdown-button.component.scss'] }) -export class FilterDropdownButtonComponent { - - constructor() { } +export class FilterDropdownButtonComponent implements OnInit { @Input() item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent - @Input() - display: string - @Input() selected: boolean @Output() toggle = new EventEmitter() + isTag: boolean + + ngOnInit() { + this.isTag = 'is_inbox_tag' in this.item // ~ this.item instanceof PaperlessTag + } toggleItem(): void { this.selected = !this.selected 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 3d47d23b7..47a46762d 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 @@ -5,7 +5,7 @@ - +
From 6f684f80705e715ad36b2c0fc823695c80912865 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 10:24:20 -0800 Subject: [PATCH 49/78] Dropdown components now accept lists not observables --- .../filter-dropdown/filter-dropdown.component.html | 2 +- .../filter-dropdown/filter-dropdown.component.ts | 7 +------ .../components/filter-editor/filter-editor.component.html | 6 +++--- src-ui/src/app/services/filter-editor-view.service.ts | 6 +++--- 4 files changed, 8 insertions(+), 13 deletions(-) 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 47a46762d..8c48f0e2f 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 @@ -3,7 +3,7 @@
- + 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 4c80bfb66..a54455153 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 @@ -14,7 +14,7 @@ export class FilterDropdownComponent implements OnInit { constructor(private filterPipe: FilterPipe) { } @Input() - items$: Observable> + items: ObjectWithId[] @Input() itemsSelected: ObjectWithId[] @@ -31,11 +31,6 @@ export class FilterDropdownComponent implements OnInit { @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef filterText: string - items: ObjectWithId[] - - ngOnInit() { - this.items$.subscribe(result => this.items = result.results) - } toggleItem(item: ObjectWithId): void { this.toggle.emit(item) 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 4c2e61d46..9c55c1e7e 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 @@ -6,9 +6,9 @@
- - - + + + diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts index ba7b6dd24..b436ecde4 100644 --- a/src-ui/src/app/services/filter-editor-view.service.ts +++ b/src-ui/src/app/services/filter-editor-view.service.ts @@ -16,9 +16,9 @@ import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; providedIn: 'root' }) export class FilterEditorViewService { - tags$: Observable> - correspondents$: Observable> - documentTypes$: Observable> + private tags$: Observable> + private correspondents$: Observable> + private documentTypes$: Observable> tags: PaperlessTag[] = [] correspondents: PaperlessCorrespondent[] From bb1725c7dd48f3c018a249b7d28ab25cc83a32f0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 10:25:51 -0800 Subject: [PATCH 50/78] Typescript cleanup --- .../filter-dropdown/filter-dropdown.component.ts | 4 ++-- .../app/components/filter-editor/filter-editor.component.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 a54455153..720c86a94 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 @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output, ElementRef, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core'; import { Observable } from 'rxjs'; import { Results } from 'src/app/data/results'; import { ObjectWithId } from 'src/app/data/object-with-id'; @@ -9,7 +9,7 @@ import { FilterPipe } from 'src/app/pipes/filter.pipe'; templateUrl: './filter-dropdown.component.html', styleUrls: ['./filter-dropdown.component.scss'] }) -export class FilterDropdownComponent implements OnInit { +export class FilterDropdownComponent { constructor(private filterPipe: FilterPipe) { } 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 9c55c1e7e..eb322414d 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 @@ -6,7 +6,7 @@
- + From d6894d3c647e8ebd40d838154920b5e9abe80124 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 10:28:09 -0800 Subject: [PATCH 51/78] Change views menu title --- .../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 0fd139b89..f408e1e2a 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 @@ -46,7 +46,7 @@
- +
From 2de546fd5285a5cfc30b3c0393bb528e771f20bc Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 11:03:50 -0800 Subject: [PATCH 52/78] Fix tag / correspondent / document type toggling logic --- .../app/services/filter-editor-view.service.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts index b436ecde4..bd25ec83b 100644 --- a/src-ui/src/app/services/filter-editor-view.service.ts +++ b/src-ui/src/app/services/filter-editor-view.service.ts @@ -103,18 +103,16 @@ export class FilterEditorViewService { private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) { let filterRules = this.filterRules let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID) - let existingRule = filterRules.find(rule => rule.type.id == filterRuleType.id) + let existingRules = filterRules.filter(rule => rule.type.id == filterRuleType.id) - if (existingRule && existingRule.value == item.id) { - filterRules.splice(filterRules.indexOf(existingRule), 1) - } else if (existingRule && filterRuleType.id == FILTER_HAS_TAG) { - filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id}) - } else if (existingRule && existingRule.value == item.id) { - return - } else if (existingRule) { - existingRule.value = item.id + if (existingRules && filterRuleType.id == FILTER_HAS_TAG) { + let existingItemRule = existingRules?.find(rule => rule.value == item.id) + if (existingItemRule) filterRules.splice(filterRules.indexOf(existingItemRule), 1) + else filterRules.push({type: filterRuleType, value: item.id}) + } else if (existingRules.length) { // Correspondents & DocumentTypes only one + filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id } else { - filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == filterRuleType.id), value: item.id}) + filterRules.push({type: filterRuleType, value: item.id}) } this.filterRules = filterRules From a61ea3555acde275a80a9de18f0e88a9d0e0d753 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 11:17:10 -0800 Subject: [PATCH 53/78] Ok now toggling logic is fixed --- src-ui/src/app/services/filter-editor-view.service.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts index bd25ec83b..071a0d577 100644 --- a/src-ui/src/app/services/filter-editor-view.service.ts +++ b/src-ui/src/app/services/filter-editor-view.service.ts @@ -104,11 +104,12 @@ export class FilterEditorViewService { let filterRules = this.filterRules let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID) let existingRules = filterRules.filter(rule => rule.type.id == filterRuleType.id) + let existingItemRule = existingRules?.find(rule => rule.value == item.id) - if (existingRules && filterRuleType.id == FILTER_HAS_TAG) { - let existingItemRule = existingRules?.find(rule => rule.value == item.id) - if (existingItemRule) filterRules.splice(filterRules.indexOf(existingItemRule), 1) - else filterRules.push({type: filterRuleType, value: item.id}) + if (existingRules && existingItemRule) { + filterRules.splice(filterRules.indexOf(existingItemRule), 1) // if exact rule exists just remove + } else if (existingItemRule && filterRuleType.multi) { // e.g. tags can have multiple + filterRules.push({type: filterRuleType, value: item.id}) } else if (existingRules.length) { // Correspondents & DocumentTypes only one filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id } else { From bcdbc975d61e50f1a52feab4d7c2a8338b3195a0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 11:20:28 -0800 Subject: [PATCH 54/78] Show filter has items selected --- .../filter-dropdown-date.component.html | 9 ++++++++- .../filter-dropdown/filter-dropdown.component.html | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) 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 83d8c6455..a80e1c491 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 @@ -1,5 +1,12 @@
- +
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 8c48f0e2f..591530ae2 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,5 +1,12 @@
- +
From 1ddad84985f918fb97b745a406f51c00f4f0d9e4 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 11:23:21 -0800 Subject: [PATCH 55/78] Fix visual clearing of date field --- .../filter-dropdown-date.component.html | 2 +- .../filter-dropdown-date.component.ts | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) 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 a80e1c491..0a3dc7057 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 @@ -1,6 +1,6 @@
From 7d212f6e80259190d69cdb8ae8deb03b3948dc17 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 11:33:57 -0800 Subject: [PATCH 58/78] Last time fixing the toggling logic, I hope =/ --- src-ui/src/app/services/filter-editor-view.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts index 071a0d577..3a3b70e9a 100644 --- a/src-ui/src/app/services/filter-editor-view.service.ts +++ b/src-ui/src/app/services/filter-editor-view.service.ts @@ -108,9 +108,9 @@ export class FilterEditorViewService { if (existingRules && existingItemRule) { filterRules.splice(filterRules.indexOf(existingItemRule), 1) // if exact rule exists just remove - } else if (existingItemRule && filterRuleType.multi) { // e.g. tags can have multiple + } else if (existingRules.length > 0 && filterRuleType.multi) { // e.g. tags can have multiple filterRules.push({type: filterRuleType, value: item.id}) - } else if (existingRules.length) { // Correspondents & DocumentTypes only one + } else if (existingRules.length > 0) { // Correspondents & DocumentTypes only one filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id } else { filterRules.push({type: filterRuleType, value: item.id}) From 2c18f6268b20ac93098dec9f5fb3ba6428729464 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 11:34:58 -0800 Subject: [PATCH 59/78] Comment cleanup --- src-ui/src/app/services/filter-editor-view.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts index 3a3b70e9a..ee7961f0f 100644 --- a/src-ui/src/app/services/filter-editor-view.service.ts +++ b/src-ui/src/app/services/filter-editor-view.service.ts @@ -106,11 +106,11 @@ export class FilterEditorViewService { let existingRules = filterRules.filter(rule => rule.type.id == filterRuleType.id) let existingItemRule = existingRules?.find(rule => rule.value == item.id) - if (existingRules && existingItemRule) { - filterRules.splice(filterRules.indexOf(existingItemRule), 1) // if exact rule exists just remove + if (existingRules && existingItemRule) { // if exact rule exists just remove + filterRules.splice(filterRules.indexOf(existingItemRule), 1) } else if (existingRules.length > 0 && filterRuleType.multi) { // e.g. tags can have multiple filterRules.push({type: filterRuleType, value: item.id}) - } else if (existingRules.length > 0) { // Correspondents & DocumentTypes only one + } else if (existingRules.length > 0) { // correspondents & documentTypes can only be one filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id } else { filterRules.push({type: filterRuleType, value: item.id}) From 7ac101d84ee26620cb7a3928b2b8b5daf68eb5ce Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 12:17:01 -0800 Subject: [PATCH 60/78] Typo! --- .../document-list/document-list.component.ts | 6 +++--- .../filter-editor/filter-editor.component.ts | 6 +++--- .../app/services/filter-editor-view.service.ts | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 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 fe03cae80..cd60054c7 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 @@ -113,17 +113,17 @@ export class DocumentListComponent implements OnInit { } clickTag(tagID: number) { - this.filterEditorService.toggleFitlerByTagID(tagID) + this.filterEditorService.toggleFilterByTagID(tagID) this.applyFilterRules() } clickCorrespondent(correspondentID: number) { - this.filterEditorService.toggleFitlerByCorrespondentID(correspondentID) + this.filterEditorService.toggleFilterByCorrespondentID(correspondentID) this.applyFilterRules() } clickDocumentType(documentTypeID: number) { - this.filterEditorService.toggleFitlerByDocumentTypeID(documentTypeID) + this.filterEditorService.toggleFilterByDocumentTypeID(documentTypeID) this.applyFilterRules() } 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 bb838f0be..a6940795e 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 @@ -52,17 +52,17 @@ export class FilterEditorComponent implements AfterViewInit { } onToggleTag(tag: PaperlessTag) { - this.filterEditorService.toggleFitlerByTag(tag) + this.filterEditorService.toggleFilterByTag(tag) this.applyFilters() } onToggleCorrespondent(correspondent: PaperlessCorrespondent) { - this.filterEditorService.toggleFitlerByCorrespondent(correspondent) + this.filterEditorService.toggleFilterByCorrespondent(correspondent) this.applyFilters() } onToggleDocumentType(documentType: PaperlessDocumentType) { - this.filterEditorService.toggleFitlerByDocumentType(documentType) + this.filterEditorService.toggleFilterByDocumentType(documentType) this.applyFilters() } diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts index ee7961f0f..0893fff2e 100644 --- a/src-ui/src/app/services/filter-editor-view.service.ts +++ b/src-ui/src/app/services/filter-editor-view.service.ts @@ -76,28 +76,28 @@ export class FilterEditorViewService { return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id)) } - toggleFitlerByTag(tag: PaperlessTag) { + toggleFilterByTag(tag: PaperlessTag) { this.toggleFilterByItem(tag, FILTER_HAS_TAG) } - toggleFitlerByCorrespondent(tag: PaperlessCorrespondent) { + toggleFilterByCorrespondent(tag: PaperlessCorrespondent) { this.toggleFilterByItem(tag, FILTER_CORRESPONDENT) } - toggleFitlerByDocumentType(tag: PaperlessDocumentType) { + toggleFilterByDocumentType(tag: PaperlessDocumentType) { this.toggleFilterByItem(tag, FILTER_DOCUMENT_TYPE) } - toggleFitlerByTagID(tagID: number) { - this.toggleFitlerByTag(this.tags?.find(t => t.id == tagID)) + toggleFilterByTagID(tagID: number) { + this.toggleFilterByTag(this.tags?.find(t => t.id == tagID)) } - toggleFitlerByCorrespondentID(correspondentID: number) { - this.toggleFitlerByCorrespondent(this.correspondents?.find(t => t.id == correspondentID)) + toggleFilterByCorrespondentID(correspondentID: number) { + this.toggleFilterByCorrespondent(this.correspondents?.find(t => t.id == correspondentID)) } - toggleFitlerByDocumentTypeID(documentTypeID: number) { - this.toggleFitlerByDocumentType(this.documentTypes?.find(t => t.id == documentTypeID)) + toggleFilterByDocumentTypeID(documentTypeID: number) { + this.toggleFilterByDocumentType(this.documentTypes?.find(t => t.id == documentTypeID)) } private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) { From ae51619243b9019902f05a6da26a54a4652a6329 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 13 Dec 2020 14:11:43 -0800 Subject: [PATCH 61/78] Make date buttons same as other dropdowns --- .../filter-dropdown-date.component.html | 11 +++++------ .../filter-dropdown-date.component.ts | 4 ++++ 2 files changed, 9 insertions(+), 6 deletions(-) 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 0a3dc7057..94da65d7c 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 @@ -9,12 +9,11 @@
-
- - - - -
+