Merge pull request #13 from shamoon/feature/unsaved-changes

Warnings for unsaved changes, 'intelligent' buttons when editing
This commit is contained in:
shamoon
2022-02-18 06:58:09 -08:00
committed by GitHub
12 changed files with 337 additions and 130 deletions

View File

@@ -2,6 +2,10 @@ import { Injectable } from '@angular/core';
import { PaperlessDocument } from '../data/paperless-document';
import { OPEN_DOCUMENT_SERVICE } from '../data/storage-keys';
import { DocumentService } from './rest/document.service';
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';
@Injectable({
providedIn: 'root'
@@ -10,7 +14,7 @@ export class OpenDocumentsService {
private MAX_OPEN_DOCUMENTS = 5
constructor(private documentService: DocumentService) {
constructor(private documentService: DocumentService, private modalService: NgbModal) {
if (sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)) {
try {
this.openDocuments = JSON.parse(sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS))
@@ -22,6 +26,7 @@ export class OpenDocumentsService {
}
private openDocuments: PaperlessDocument[] = []
private dirtyDocuments: Set<number> = new Set<number>()
refreshDocument(id: number) {
let index = this.openDocuments.findIndex(doc => doc.id == id)
@@ -53,17 +58,62 @@ export class OpenDocumentsService {
}
}
closeDocument(doc: PaperlessDocument) {
setDirty(documentId: number, dirty: boolean) {
if (dirty) this.dirtyDocuments.add(documentId)
else this.dirtyDocuments.delete(documentId)
}
closeDocument(doc: PaperlessDocument): Observable<boolean> {
let index = this.openDocuments.findIndex(d => d.id == doc.id)
if (index > -1) {
if (index == -1) return of(true);
if (!this.dirtyDocuments.has(doc.id)) {
this.openDocuments.splice(index, 1)
this.save()
return of(true)
} else {
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
modal.componentInstance.title = $localize`Unsaved Changes`
modal.componentInstance.messageBold = $localize`You have unsaved changes.`
modal.componentInstance.message = $localize`Are you sure you want to close this document?`
modal.componentInstance.btnClass = "btn-warning"
modal.componentInstance.btnCaption = $localize`Close document`
modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
modal.componentInstance.buttonsEnabled = false
modal.close()
this.openDocuments.splice(index, 1)
this.dirtyDocuments.delete(doc.id)
this.save()
})
const subject = new Subject<boolean>()
modal.componentInstance.confirmSubject = subject
return subject.asObservable()
}
}
closeAll() {
this.openDocuments.splice(0, this.openDocuments.length)
this.save()
closeAll(): Observable<boolean> {
if (this.dirtyDocuments.size) {
let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'})
modal.componentInstance.title = $localize`Unsaved Changes`
modal.componentInstance.messageBold = $localize`You have unsaved changes.`
modal.componentInstance.message = $localize`Are you sure you want to close all documents?`
modal.componentInstance.btnClass = "btn-warning"
modal.componentInstance.btnCaption = $localize`Close documents`
modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
modal.componentInstance.buttonsEnabled = false
modal.close()
this.openDocuments.splice(0, this.openDocuments.length)
this.dirtyDocuments.clear()
this.save()
})
const subject = new Subject<boolean>()
modal.componentInstance.confirmSubject = subject
return subject.asObservable()
} else {
this.openDocuments.splice(0, this.openDocuments.length)
this.dirtyDocuments.clear()
this.save()
return of(true)
}
}
save() {