From 1efd226f75d090dc486311499290aa18ac0e0ead Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 15 May 2022 23:25:46 -0700 Subject: [PATCH] let OpenDocumentsService handle nav --- .../saved-view-widget.component.html | 2 +- .../saved-view-widget.component.ts | 13 ++----- .../document-detail.component.ts | 2 +- .../document-card-large.component.html | 2 +- .../document-card-large.component.ts | 14 +------- .../document-card-small.component.html | 2 +- .../document-card-small.component.ts | 15 ++------ .../document-list.component.html | 2 +- .../document-list/document-list.component.ts | 16 ++------- .../app/services/open-documents.service.ts | 35 ++++++++++++++----- 10 files changed, 38 insertions(+), 65 deletions(-) diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index eb9a136ab..50d064c37 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -11,7 +11,7 @@ - + {{doc.created | customDate}} {{doc.title | documentTitle}} diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts index 89db3ef81..94e0c4052 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core' import { Router } from '@angular/router' -import { first, Subscription } from 'rxjs' +import { Subscription } from 'rxjs' import { PaperlessDocument } from 'src/app/data/paperless-document' import { PaperlessSavedView } from 'src/app/data/paperless-saved-view' import { ConsumerStatusService } from 'src/app/services/consumer-status.service' @@ -23,7 +23,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { private router: Router, private queryParamsService: QueryParamsService, private consumerStatusService: ConsumerStatusService, - private openDocumentsService: OpenDocumentsService + public openDocumentsService: OpenDocumentsService ) {} @Input() @@ -72,15 +72,6 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { } } - clickDoc(doc: PaperlessDocument) { - this.openDocumentsService - .openDocument(doc) - .pipe(first()) - .subscribe((open) => { - if (open) this.router.navigate(['documents', doc.id]) - }) - } - clickTag(tag: PaperlessTag) { this.queryParamsService.navigateWithFilterRules([ { rule_type: FILTER_HAS_TAGS_ALL, value: tag.id.toString() }, 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 4d66ea384..6f1614e5f 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -204,7 +204,7 @@ export class DocumentDetailComponent this.openDocumentService.getOpenDocument(this.documentId) ) } else { - this.openDocumentService.openDocument(doc) + this.openDocumentService.openDocument(doc, false) this.updateComponent(doc) } diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index d0080f0ce..5eb4a97dd 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -37,7 +37,7 @@  More like this - +  Edit diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index 8eff2e491..061a0e681 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -14,8 +14,6 @@ import { } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { OpenDocumentsService } from 'src/app/services/open-documents.service' -import { Router } from '@angular/router' -import { first } from 'rxjs' @Component({ selector: 'app-document-card-large', @@ -29,8 +27,7 @@ export class DocumentCardLargeComponent implements OnInit { constructor( private documentService: DocumentService, private settingsService: SettingsService, - private openDocumentsService: OpenDocumentsService, - private router: Router + public openDocumentsService: OpenDocumentsService ) {} @Input() @@ -121,13 +118,4 @@ export class DocumentCardLargeComponent implements OnInit { get contentTrimmed() { return this.document.content.substr(0, 500) } - - clickEdit() { - this.openDocumentsService - .openDocument(this.document) - .pipe(first()) - .subscribe((open) => { - if (open) this.router.navigate(['documents', this.document.id]) - }) - } } diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 7844ce419..6c68cc26f 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -63,7 +63,7 @@
- + 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 c7fff39b5..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 @@ -6,7 +6,7 @@ import { Output, ViewChild, } from '@angular/core' -import { first, map } from 'rxjs/operators' +import { map } from 'rxjs/operators' import { PaperlessDocument } from 'src/app/data/paperless-document' import { DocumentService } from 'src/app/services/rest/document.service' import { @@ -15,7 +15,6 @@ import { } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { OpenDocumentsService } from 'src/app/services/open-documents.service' -import { Router } from '@angular/router' @Component({ selector: 'app-document-card-small', @@ -29,8 +28,7 @@ export class DocumentCardSmallComponent implements OnInit { constructor( private documentService: DocumentService, private settingsService: SettingsService, - private openDocumentsService: OpenDocumentsService, - private router: Router + public openDocumentsService: OpenDocumentsService ) {} @Input() @@ -113,13 +111,4 @@ export class DocumentCardSmallComponent implements OnInit { mouseLeaveCard() { this.popover.close() } - - clickEdit() { - this.openDocumentsService - .openDocument(this.document) - .pipe(first()) - .subscribe((open) => { - if (open) this.router.navigate(['documents', this.document.id]) - }) - } } 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 1b0eae525..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 3d6db5731..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 @@ -21,10 +21,7 @@ import { import { ConsumerStatusService } from 'src/app/services/consumer-status.service' import { DocumentListViewService } from 'src/app/services/document-list-view.service' import { OpenDocumentsService } from 'src/app/services/open-documents.service' -import { - filterRulesFromQueryParams, - QueryParamsService, -} from 'src/app/services/query-params.service' +import { QueryParamsService } from 'src/app/services/query-params.service' import { DOCUMENT_SORT_FIELDS, DOCUMENT_SORT_FIELDS_FULLTEXT, @@ -49,7 +46,7 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit { private modalService: NgbModal, private consumerStatusService: ConsumerStatusService, private queryParamsService: QueryParamsService, - private openDocumentsService: OpenDocumentsService + public openDocumentsService: OpenDocumentsService ) {} @ViewChild('filterEditor') @@ -247,15 +244,6 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit { else this.list.selectRangeTo(document) } - clickEdit(doc: PaperlessDocument) { - this.openDocumentsService - .openDocument(doc) - .pipe(first()) - .subscribe((open) => { - if (open) this.router.navigate(['documents', doc.id]) - }) - } - clickTag(tagID: number) { this.list.selectNone() setTimeout(() => { diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts index 37e29cd6e..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,26 +57,41 @@ export class OpenDocumentsService { return this.openDocuments.find((d) => d.id == id) } - openDocument(doc: PaperlessDocument): Observable { + openDocument( + doc: PaperlessDocument, + navigate: boolean = true + ): 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.openDocuments.unshift(doc) - this.save() - } + if (closed) this.finishOpenDocument(doc, navigate) }) return closeObservable } else { - this.openDocuments.unshift(doc) - this.save() + // not at max + this.finishOpenDocument(doc, navigate) + } + } 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]) + } + } + setDirty(documentId: number, dirty: boolean) { if (dirty) this.dirtyDocuments.add(documentId) else this.dirtyDocuments.delete(documentId) @@ -96,7 +113,7 @@ export class OpenDocumentsService { $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`