From 54d90a4c4b8215551546447073c662e4df0cef63 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Sun, 13 Dec 2020 20:37:13 -0800
Subject: [PATCH] Code cleanup

---
 .../document-list/document-list.component.ts  |  6 ++---
 .../services/filter-editor-view.service.ts    | 25 ++++++-------------
 2 files changed, 11 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 cd60054c7..8d090f001 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.toggleFilterByTagID(tagID)
+    this.filterEditorService.toggleFilterByTag(tagID)
     this.applyFilterRules()
   }
 
   clickCorrespondent(correspondentID: number) {
-    this.filterEditorService.toggleFilterByCorrespondentID(correspondentID)
+    this.filterEditorService.toggleFilterByCorrespondent(correspondentID)
     this.applyFilterRules()
   }
 
   clickDocumentType(documentTypeID: number) {
-    this.filterEditorService.toggleFilterByDocumentTypeID(documentTypeID)
+    this.filterEditorService.toggleFilterByDocumentType(documentTypeID)
     this.applyFilterRules()
   }
 
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 b50391376..89f40189c 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,19 @@ export class FilterEditorViewService {
     return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
   }
 
-  toggleFilterByTag(tag: PaperlessTag) {
+  toggleFilterByTag(tag: PaperlessTag | number) {
+    if (typeof tag == 'number') tag = this.tags?.find(t => t.id == tag)
     this.toggleFilterByItem(tag, FILTER_HAS_TAG)
   }
 
-  toggleFilterByCorrespondent(tag: PaperlessCorrespondent) {
-    this.toggleFilterByItem(tag, FILTER_CORRESPONDENT)
+  toggleFilterByCorrespondent(correspondent: PaperlessCorrespondent | number) {
+    if (typeof correspondent == 'number') correspondent = this.correspondents?.find(t => t.id == correspondent)
+    this.toggleFilterByItem(correspondent, FILTER_CORRESPONDENT)
   }
 
-  toggleFilterByDocumentType(tag: PaperlessDocumentType) {
-    this.toggleFilterByItem(tag, FILTER_DOCUMENT_TYPE)
-  }
-
-  toggleFilterByTagID(tagID: number) {
-    this.toggleFilterByTag(this.tags?.find(t => t.id == tagID))
-  }
-
-  toggleFilterByCorrespondentID(correspondentID: number) {
-    this.toggleFilterByCorrespondent(this.correspondents?.find(t => t.id == correspondentID))
-  }
-
-  toggleFilterByDocumentTypeID(documentTypeID: number) {
-    this.toggleFilterByDocumentType(this.documentTypes?.find(t => t.id == documentTypeID))
+  toggleFilterByDocumentType(documentType: PaperlessDocumentType | number) {
+    if (typeof documentType == 'number') documentType = this.documentTypes?.find(t => t.id == documentType)
+    this.toggleFilterByItem(documentType, FILTER_DOCUMENT_TYPE)
   }
 
   private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {