From f5e740f2ecc6642c3c8b51e2258e672a19a7db80 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 15 May 2022 22:55:25 -0700 Subject: [PATCH] Warn on closing edited doc due to max open docs --- .../saved-view-widget.component.html | 2 +- .../saved-view-widget.component.ts | 15 +++++++++-- .../document-card-large.component.html | 2 +- .../document-card-large.component.ts | 20 ++++++++++---- .../document-card-small.component.html | 2 +- .../document-card-small.component.ts | 17 ++++++++++-- .../document-list.component.html | 2 +- .../document-list/document-list.component.ts | 13 +++++++++- .../app/services/open-documents.service.ts | 26 ++++++++++++++----- 9 files changed, 79 insertions(+), 20 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 8d5b9c43f..eb9a136ab 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 6e8b67900..89db3ef81 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 { Subscription } from 'rxjs' +import { first, 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' @@ -8,6 +8,7 @@ import { DocumentService } from 'src/app/services/rest/document.service' import { PaperlessTag } from 'src/app/data/paperless-tag' import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type' import { QueryParamsService } from 'src/app/services/query-params.service' +import { OpenDocumentsService } from 'src/app/services/open-documents.service' @Component({ selector: 'app-saved-view-widget', @@ -21,7 +22,8 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { private documentService: DocumentService, private router: Router, private queryParamsService: QueryParamsService, - private consumerStatusService: ConsumerStatusService + private consumerStatusService: ConsumerStatusService, + private openDocumentsService: OpenDocumentsService ) {} @Input() @@ -70,6 +72,15 @@ 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-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 a5b238504..d0080f0ce 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 1c4e9a7aa..8eff2e491 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 @@ -6,7 +6,6 @@ import { Output, ViewChild, } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { PaperlessDocument } from 'src/app/data/paperless-document' import { DocumentService } from 'src/app/services/rest/document.service' import { @@ -14,8 +13,9 @@ import { SETTINGS_KEYS, } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' -import { DocumentListViewService } from 'src/app/services/document-list-view.service' -import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' +import { OpenDocumentsService } from 'src/app/services/open-documents.service' +import { Router } from '@angular/router' +import { first } from 'rxjs' @Component({ selector: 'app-document-card-large', @@ -28,8 +28,9 @@ import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' export class DocumentCardLargeComponent implements OnInit { constructor( private documentService: DocumentService, - private sanitizer: DomSanitizer, - private settingsService: SettingsService + private settingsService: SettingsService, + private openDocumentsService: OpenDocumentsService, + private router: Router ) {} @Input() @@ -120,4 +121,13 @@ 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 2e8d29b7f..7844ce419 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 cbff950a2..c7fff39b5 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 { map } from 'rxjs/operators' +import { first, map } from 'rxjs/operators' import { PaperlessDocument } from 'src/app/data/paperless-document' import { DocumentService } from 'src/app/services/rest/document.service' import { @@ -14,6 +14,8 @@ 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' +import { Router } from '@angular/router' @Component({ selector: 'app-document-card-small', @@ -26,7 +28,9 @@ import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' export class DocumentCardSmallComponent implements OnInit { constructor( private documentService: DocumentService, - private settingsService: SettingsService + private settingsService: SettingsService, + private openDocumentsService: OpenDocumentsService, + private router: Router ) {} @Input() @@ -109,4 +113,13 @@ 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 4a15fe976..1b0eae525 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..3d6db5731 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,6 +20,7 @@ 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 { OpenDocumentsService } from 'src/app/services/open-documents.service' import { filterRulesFromQueryParams, QueryParamsService, @@ -47,7 +48,8 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit { private toastService: ToastService, private modalService: NgbModal, private consumerStatusService: ConsumerStatusService, - private queryParamsService: QueryParamsService + private queryParamsService: QueryParamsService, + private openDocumentsService: OpenDocumentsService ) {} @ViewChild('filterEditor') @@ -245,6 +247,15 @@ 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 5297a38bf..37e29cd6e 100644 --- a/src-ui/src/app/services/open-documents.service.ts +++ b/src-ui/src/app/services/open-documents.service.ts @@ -55,14 +55,24 @@ export class OpenDocumentsService { return this.openDocuments.find((d) => d.id == id) } - openDocument(doc: PaperlessDocument) { + openDocument(doc: PaperlessDocument): 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) { + 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() + } + }) + return closeObservable + } else { + this.openDocuments.unshift(doc) + this.save() } - this.save() } + return of(true) } setDirty(documentId: number, dirty: boolean) { @@ -82,7 +92,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`