From 2b4a0efef84c33d95162cb7cef93cb90a3f193dd Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 2 Apr 2021 10:57:06 -0700
Subject: [PATCH] Move add to split merge directly into bulk editor

---
 .../bulk-editor/bulk-editor.component.ts             | 12 +++++++-----
 .../document-list/document-list.component.html       |  2 +-
 .../document-list/document-list.component.ts         |  9 +--------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index 9f190c83..9d4e3f92 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -16,6 +16,8 @@ import { MatchingModel } from 'src/app/data/matching-model';
 import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { saveAs } from 'file-saver';
+import { SplitMergeService } from 'src/app/services/split-merge.service';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-bulk-editor',
@@ -32,9 +34,6 @@ export class BulkEditorComponent {
   correspondentSelectionModel = new FilterableDropdownSelectionModel()
   documentTypeSelectionModel = new FilterableDropdownSelectionModel()
 
-  @Output()
-  addSelectedToSplitMerge = new EventEmitter()
-
   constructor(
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
@@ -44,7 +43,9 @@ export class BulkEditorComponent {
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService,
     private settings: SettingsService,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private splitMergeService: SplitMergeService,
+    private router: Router
   ) { }
 
   applyOnClose: boolean = this.settings.get(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE)
@@ -219,6 +220,7 @@ export class BulkEditorComponent {
   }
 
   addToSplitMerge() {
-    this.addSelectedToSplitMerge.next()
+    this.splitMergeService.addDocuments(this.list.selectedDocuments)
+    this.router.navigate(["split_merge"])
   }
 }
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 13d6e97d..53f3e662 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -77,7 +77,7 @@
 
 <div class="w-100 mb-2 mb-sm-4">
   <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" [rulesModified]="filterRulesModified" (filterRulesChange)="rulesChanged()" (reset)="resetFilters()" #filterEditor></app-filter-editor>
-  <app-bulk-editor [hidden]="!isBulkEditing" (addSelectedToSplitMerge)="addToSplitMerge()"></app-bulk-editor>
+  <app-bulk-editor [hidden]="!isBulkEditing"></app-bulk-editor>
 </div>
 
 <div class="d-flex justify-content-between align-items-center">
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 8e2dfa28..cf7afb84 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
@@ -12,7 +12,6 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { FilterEditorComponent } from './filter-editor/filter-editor.component';
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
-import { SplitMergeService } from 'src/app/services/split-merge.service';
 
 @Component({
   selector: 'app-document-list',
@@ -28,8 +27,7 @@ export class DocumentListComponent implements OnInit, OnDestroy {
     private router: Router,
     private toastService: ToastService,
     private modalService: NgbModal,
-    private consumerStatusService: ConsumerStatusService,
-    private splitMergeService: SplitMergeService
+    private consumerStatusService: ConsumerStatusService
   ) { }
 
   @ViewChild("filterEditor")
@@ -212,9 +210,4 @@ export class DocumentListComponent implements OnInit, OnDestroy {
   trackByDocumentId(index, item: PaperlessDocument) {
     return item.id
   }
-
-  addToSplitMerge() {
-    this.splitMergeService.addDocuments(this.list.selectedDocuments)
-    this.router.navigate(["split_merge"])
-  }
 }