Close document if delete original chosen

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
index 0fc1ea5efa2828beeab9bfd8d42c8333170ceb14..748150959a937e8b5a22a791ce0c529c040c94f1 100644 (file)
--- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
@@ -1161,6 +1161,8 @@ describe('DocumentDetailComponent', () => {
   it('should support pdf editor, handle error', () => {
     let modal: NgbModalRef
     modalService.activeInstances.subscribe((m) => (modal = m[0]))
+    const closeSpy = jest.spyOn(openDocumentsService, 'closeDocument')
+    const errorSpy = jest.spyOn(toastService, 'showError')
     initNormally()
     component.editPdf()
     expect(modal).not.toBeUndefined()
@@ -1180,18 +1182,19 @@ describe('DocumentDetailComponent', () => {
         include_metadata: true,
       },
     })
-    req.flush(true)
+    req.error(new ErrorEvent('failed'))
+    expect(errorSpy).toHaveBeenCalled()
 
     component.editPdf()
     modal.componentInstance.documentID = doc.id
     modal.componentInstance.pages = [{ page: 1, rotate: 0, splitAfter: true }]
+    modal.componentInstance.deleteOriginal = true
     modal.componentInstance.confirm()
-    const errorSpy = jest.spyOn(toastService, 'showError')
     req = httpTestingController.expectOne(
       `${environment.apiBaseUrl}documents/bulk_edit/`
     )
-    req.error(new ErrorEvent('failed'))
-    expect(errorSpy).toHaveBeenCalled()
+    req.flush(true)
+    expect(closeSpy).toHaveBeenCalled()
   })
 
   it('should support keyboard shortcuts', () => {

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index cbc4027e019fb4d9fb47748a7a614f4a59d1e64b..45fb9fc83b3d34eacb1edc2d2ba0890c03009910 100644 (file)
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -1378,6 +1378,9 @@ export class DocumentDetailComponent
                 $localize`PDF edit operation for "${this.document.title}" will begin in the background.`
               )
               modal.close()
+              if (modal.componentInstance.deleteOriginal) {
+                this.openDocumentService.closeDocument(this.document)
+              }
             },
             error: (error) => {
               if (modal) {