From 7f4cfc0b76496ab60da4bf85ef2b1462e4197095 Mon Sep 17 00:00:00 2001
From: jonaswinkler <jonas.winkler@jpwinkler.de>
Date: Tue, 29 Dec 2020 17:20:45 +0100
Subject: [PATCH] fix a couple issues with the bulk editor

---
 .../document-list/bulk-editor/bulk-editor.component.ts      | 6 ++----
 src-ui/src/app/services/document-list-view.service.ts       | 2 +-
 2 files changed, 3 insertions(+), 5 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 64b84b47a..88efcee06 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
@@ -56,6 +56,7 @@ export class BulkEditorComponent {
     return this.documentService.bulkEdit(Array.from(this.list.selected), method, args).pipe(
       tap(() => {
         this.list.reload()
+        this.list.reduceSelectionToFilter()
         this.list.selected.forEach(id => {
           this.openDocumentService.refreshDocument(id)
         })
@@ -118,7 +119,7 @@ export class BulkEditorComponent {
       } else if (changedTags.itemsToAdd.length > 1 && changedTags.itemsToRemove.length == 0) {
         modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to all ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 1) {
-        let tag = changedTags.itemsToAdd[0]
+        let tag = changedTags.itemsToRemove[0]
         modal.componentInstance.message = $localize`This operation will remove the tag ${tag.name} from all ${this.list.selected.size} selected document(s).`
       } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length > 1) {
         modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from all ${this.list.selected.size} selected document(s).`
@@ -139,7 +140,6 @@ export class BulkEditorComponent {
   private performSetTags(modal, changedTags: ChangedItems) {
     this.executeBulkOperation('modify_tags', {"add_tags": changedTags.itemsToAdd.map(t => t.id), "remove_tags": changedTags.itemsToRemove.map(t => t.id)}).subscribe(
       response => {
-        this.tagService.clearCache()
         if (modal) {
           modal.close()
         }
@@ -173,7 +173,6 @@ export class BulkEditorComponent {
   private performSetCorrespondents(modal, correspondent: MatchingModel) {
     this.executeBulkOperation('set_correspondent', {"correspondent": correspondent ? correspondent.id : null}).subscribe(
       response => {
-        this.correspondentService.clearCache()
         if (modal) {
           modal.close()
         }
@@ -207,7 +206,6 @@ export class BulkEditorComponent {
   private performSetDocumentTypes(modal, documentType) {
     this.executeBulkOperation('set_document_type', {"document_type": documentType ? documentType.id : null}).subscribe(
       response => {
-        this.documentTypeService.clearCache()
         if (modal) {
           modal.close()
         }
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index ab78d78b1..dfcf9c0c5 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -203,7 +203,7 @@ export class DocumentListViewService {
     this.selected.clear()
   }
 
-  private reduceSelectionToFilter() {
+  reduceSelectionToFilter() {
     if (this.selected.size > 0) {
       this.documentService.listAllFilteredIds(this.filterRules).subscribe(ids => {
         let subset = new Set<number>()