From c41d1a78a86d1ac585ac03e424d733087ca3fe09 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 8 Nov 2022 10:53:41 -0800 Subject: [PATCH] remove unused toastService from edit dialogs and add confirmation --- .../correspondent-edit-dialog.component.ts | 9 ++---- .../document-type-edit-dialog.component.ts | 9 ++---- .../edit-dialog/edit-dialog.component.ts | 5 +-- .../tag-edit-dialog.component.ts | 9 ++---- .../management-list.component.ts | 32 ++++++++++++++++--- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.ts index 86be7414d..7361e5e4b 100644 --- a/src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.ts @@ -5,7 +5,6 @@ import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit- import { DEFAULT_MATCHING_ALGORITHM } from 'src/app/data/matching-model' import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent' import { CorrespondentService } from 'src/app/services/rest/correspondent.service' -import { ToastService } from 'src/app/services/toast.service' @Component({ selector: 'app-correspondent-edit-dialog', @@ -13,12 +12,8 @@ import { ToastService } from 'src/app/services/toast.service' styleUrls: ['./correspondent-edit-dialog.component.scss'], }) export class CorrespondentEditDialogComponent extends EditDialogComponent { - constructor( - service: CorrespondentService, - activeModal: NgbActiveModal, - toastService: ToastService - ) { - super(service, activeModal, toastService) + constructor(service: CorrespondentService, activeModal: NgbActiveModal) { + super(service, activeModal) } getCreateTitle() { diff --git a/src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.ts index bcd2363fd..d565e66e1 100644 --- a/src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.ts @@ -5,7 +5,6 @@ import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit- import { DEFAULT_MATCHING_ALGORITHM } from 'src/app/data/matching-model' import { PaperlessDocumentType } from 'src/app/data/paperless-document-type' import { DocumentTypeService } from 'src/app/services/rest/document-type.service' -import { ToastService } from 'src/app/services/toast.service' @Component({ selector: 'app-document-type-edit-dialog', @@ -13,12 +12,8 @@ import { ToastService } from 'src/app/services/toast.service' styleUrls: ['./document-type-edit-dialog.component.scss'], }) export class DocumentTypeEditDialogComponent extends EditDialogComponent { - constructor( - service: DocumentTypeService, - activeModal: NgbActiveModal, - toastService: ToastService - ) { - super(service, activeModal, toastService) + constructor(service: DocumentTypeService, activeModal: NgbActiveModal) { + super(service, activeModal) } getCreateTitle() { diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts index 92b16a93d..e87eed438 100644 --- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts @@ -2,11 +2,9 @@ import { Directive, EventEmitter, Input, OnInit, Output } from '@angular/core' import { FormGroup } from '@angular/forms' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' import { Observable } from 'rxjs' -import { map } from 'rxjs/operators' import { MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/matching-model' import { ObjectWithId } from 'src/app/data/object-with-id' import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service' -import { ToastService } from 'src/app/services/toast.service' @Directive() export abstract class EditDialogComponent @@ -14,8 +12,7 @@ export abstract class EditDialogComponent { constructor( private service: AbstractPaperlessService, - private activeModal: NgbActiveModal, - private toastService: ToastService + private activeModal: NgbActiveModal ) {} @Input() diff --git a/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.ts index 18d476dfe..db106d990 100644 --- a/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.ts @@ -4,7 +4,6 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component' import { PaperlessTag } from 'src/app/data/paperless-tag' import { TagService } from 'src/app/services/rest/tag.service' -import { ToastService } from 'src/app/services/toast.service' import { randomColor } from 'src/app/utils/color' import { DEFAULT_MATCHING_ALGORITHM } from 'src/app/data/matching-model' @@ -14,12 +13,8 @@ import { DEFAULT_MATCHING_ALGORITHM } from 'src/app/data/matching-model' styleUrls: ['./tag-edit-dialog.component.scss'], }) export class TagEditDialogComponent extends EditDialogComponent { - constructor( - service: TagService, - activeModal: NgbActiveModal, - toastService: ToastService - ) { - super(service, activeModal, toastService) + constructor(service: TagService, activeModal: NgbActiveModal) { + super(service, activeModal) } getCreateTitle() { diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.ts b/src-ui/src/app/components/manage/management-list/management-list.component.ts index 317cf6fee..d0864d6f5 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.ts +++ b/src-ui/src/app/components/manage/management-list/management-list.component.ts @@ -120,8 +120,20 @@ export abstract class ManagementListComponent backdrop: 'static', }) activeModal.componentInstance.dialogMode = 'create' - activeModal.componentInstance.success.subscribe((o) => { - this.reloadData() + activeModal.componentInstance.success.subscribe({ + next: () => { + this.reloadData() + this.toastService.showInfo( + $localize`Successfully created ${this.typeName}.` + ) + }, + error: (e) => { + this.toastService.showInfo( + $localize`Error occurred while creating ${ + this.typeName + } : ${e.toString()}.` + ) + }, }) } @@ -131,8 +143,20 @@ export abstract class ManagementListComponent }) activeModal.componentInstance.object = object activeModal.componentInstance.dialogMode = 'edit' - activeModal.componentInstance.success.subscribe((o) => { - this.reloadData() + activeModal.componentInstance.success.subscribe({ + next: () => { + this.reloadData() + this.toastService.showInfo( + $localize`Successfully updated ${this.typeName}.` + ) + }, + error: (e) => { + this.toastService.showInfo( + $localize`Error occurred while saving ${ + this.typeName + } : ${e.toString()}.` + ) + }, }) }