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] 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 } }