From 20fc065567b321abc6b57ea69128d1a0a4efcc44 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Thu, 3 Dec 2020 15:02:27 +0100 Subject: [PATCH] hide the filter when it's cleared. --- .../components/document-list/document-list.component.html | 2 +- .../app/components/document-list/document-list.component.ts | 5 +++++ .../app/components/filter-editor/filter-editor.component.ts | 5 ++++- 3 files changed, 10 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 26a323276..48387b3e3 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 @@ -70,7 +70,7 @@
Filter
- +
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 3942fcd0c..84f4bc09e 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 @@ -66,6 +66,11 @@ export class DocumentListComponent implements OnInit { this.list.filterRules = this.filterRules } + clearFilterRules() { + this.list.filterRules = this.filterRules + this.showFilter = false + } + loadViewConfig(config: SavedViewConfig) { this.filterRules = cloneFilterRules(config.filterRules) this.list.load(config) 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 9a104c465..2eeac7dcd 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 @@ -18,6 +18,9 @@ export class FilterEditorComponent implements OnInit { constructor(private documentTypeService: DocumentTypeService, private tagService: TagService, private correspondentService: CorrespondentService) { } + @Output() + clear = new EventEmitter() + @Input() filterRules: FilterRule[] = [] @@ -48,7 +51,7 @@ export class FilterEditorComponent implements OnInit { clearClicked() { this.filterRules.splice(0,this.filterRules.length) - this.apply.next() + this.clear.next() } ngOnInit(): void {