-
+
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 cbff950a2..c166b42cb 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
@@ -14,6 +14,7 @@ import {
SETTINGS_KEYS,
} from 'src/app/services/settings.service'
import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
+import { OpenDocumentsService } from 'src/app/services/open-documents.service'
@Component({
selector: 'app-document-card-small',
@@ -26,7 +27,8 @@ import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
export class DocumentCardSmallComponent implements OnInit {
constructor(
private documentService: DocumentService,
- private settingsService: SettingsService
+ private settingsService: SettingsService,
+ public openDocumentsService: OpenDocumentsService
) {}
@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 4a15fe976..aa43243fc 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
@@ -168,7 +168,7 @@
- {{d.title | documentTitle}}
+ {{d.title | documentTitle}}
|
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 01c2bee34..8cf6c3848 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
@@ -20,10 +20,8 @@ import {
} from 'src/app/directives/sortable.directive'
import { ConsumerStatusService } from 'src/app/services/consumer-status.service'
import { DocumentListViewService } from 'src/app/services/document-list-view.service'
-import {
- filterRulesFromQueryParams,
- QueryParamsService,
-} from 'src/app/services/query-params.service'
+import { OpenDocumentsService } from 'src/app/services/open-documents.service'
+import { QueryParamsService } from 'src/app/services/query-params.service'
import {
DOCUMENT_SORT_FIELDS,
DOCUMENT_SORT_FIELDS_FULLTEXT,
@@ -47,7 +45,8 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
private toastService: ToastService,
private modalService: NgbModal,
private consumerStatusService: ConsumerStatusService,
- private queryParamsService: QueryParamsService
+ private queryParamsService: QueryParamsService,
+ public openDocumentsService: OpenDocumentsService
) {}
@ViewChild('filterEditor')
diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts
index 5297a38bf..d7746d261 100644
--- a/src-ui/src/app/services/open-documents.service.ts
+++ b/src-ui/src/app/services/open-documents.service.ts
@@ -6,6 +6,7 @@ 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',
@@ -15,7 +16,8 @@ export class OpenDocumentsService {
constructor(
private documentService: DocumentService,
- private modalService: NgbModal
+ private modalService: NgbModal,
+ private router: Router
) {
if (sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)) {
try {
@@ -55,13 +57,38 @@ export class OpenDocumentsService {
return this.openDocuments.find((d) => d.id == id)
}
- openDocument(doc: PaperlessDocument) {
+ openDocument(
+ doc: PaperlessDocument,
+ navigate: boolean = true
+ ): Observable {
if (this.openDocuments.find((d) => d.id == doc.id) == null) {
- this.openDocuments.unshift(doc)
- if (this.openDocuments.length > this.MAX_OPEN_DOCUMENTS) {
- this.openDocuments.pop()
+ 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)
+ })
+ return closeObservable
+ } else {
+ // not at max
+ this.finishOpenDocument(doc, navigate)
}
- this.save()
+ } else {
+ // doc is open, just maybe navigate
+ if (navigate) {
+ this.router.navigate(['documents', doc.id])
+ }
+ }
+ return of(true)
+ }
+
+ private finishOpenDocument(doc: PaperlessDocument, navigate: boolean) {
+ this.openDocuments.unshift(doc)
+ this.dirtyDocuments.delete(doc.id)
+ this.save()
+ if (navigate) {
+ this.router.navigate(['documents', doc.id])
}
}
@@ -82,7 +109,11 @@ export class OpenDocumentsService {
backdrop: 'static',
})
modal.componentInstance.title = $localize`Unsaved Changes`
- modal.componentInstance.messageBold = $localize`You have unsaved changes.`
+ modal.componentInstance.messageBold =
+ $localize`You have unsaved changes to the document` +
+ ' "' +
+ doc.title +
+ '".'
modal.componentInstance.message = $localize`Are you sure you want to close this document?`
modal.componentInstance.btnClass = 'btn-warning'
modal.componentInstance.btnCaption = $localize`Close document`
diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss
index a18ce1358..732ac47d9 100644
--- a/src-ui/src/theme.scss
+++ b/src-ui/src/theme.scss
@@ -39,7 +39,7 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml, |