-
+
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index 3f7fc7982..8e6ae33a6 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -11,7 +11,6 @@ import { PaperlessDocument } from 'src/app/data/paperless-document'
import { DocumentService } from 'src/app/services/rest/document.service'
import { SettingsService } from 'src/app/services/settings.service'
import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
-import { OpenDocumentsService } from 'src/app/services/open-documents.service'
import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
@Component({
@@ -25,8 +24,7 @@ import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
export class DocumentCardSmallComponent implements OnInit {
constructor(
private documentService: DocumentService,
- private settingsService: SettingsService,
- public openDocumentsService: OpenDocumentsService
+ private settingsService: SettingsService
) {}
@Input()
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 9357813f6..892a0d3b2 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
@@ -179,7 +179,7 @@
- {{d.title | documentTitle}}
+ {{d.title | documentTitle}}
|
diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts
index 8533166c3..a21523458 100644
--- a/src-ui/src/app/services/open-documents.service.ts
+++ b/src-ui/src/app/services/open-documents.service.ts
@@ -6,7 +6,6 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component'
import { Observable, Subject, of } from 'rxjs'
import { first } from 'rxjs/operators'
-import { Router } from '@angular/router'
@Injectable({
providedIn: 'root',
@@ -16,8 +15,7 @@ export class OpenDocumentsService {
constructor(
private documentService: DocumentService,
- private modalService: NgbModal,
- private router: Router
+ private modalService: NgbModal
) {
if (sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)) {
try {
@@ -57,39 +55,28 @@ export class OpenDocumentsService {
return this.openDocuments.find((d) => d.id == id)
}
- openDocument(
- doc: PaperlessDocument,
- navigate: boolean = true
- ): Observable {
+ openDocument(doc: PaperlessDocument): Observable {
if (this.openDocuments.find((d) => d.id == doc.id) == null) {
if (this.openDocuments.length == this.MAX_OPEN_DOCUMENTS) {
// at max, ensure changes arent lost
const docToRemove = this.openDocuments[this.MAX_OPEN_DOCUMENTS - 1]
const closeObservable = this.closeDocument(docToRemove)
closeObservable.pipe(first()).subscribe((closed) => {
- if (closed) this.finishOpenDocument(doc, navigate)
+ if (closed) this.finishOpenDocument(doc)
})
return closeObservable
} else {
// not at max
- this.finishOpenDocument(doc, navigate)
- }
- } else {
- // doc is open, just maybe navigate
- if (navigate) {
- this.router.navigate(['documents', doc.id])
+ this.finishOpenDocument(doc)
}
}
return of(true)
}
- private finishOpenDocument(doc: PaperlessDocument, navigate: boolean) {
+ private finishOpenDocument(doc: PaperlessDocument) {
this.openDocuments.unshift(doc)
this.dirtyDocuments.delete(doc.id)
this.save()
- if (navigate) {
- this.router.navigate(['documents', doc.id])
- }
}
setDirty(doc: PaperlessDocument, dirty: boolean) {
|