diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts index aa68d027ee..6de221e642 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { ConfirmationService } from '../../services/confirmation.service'; -import { Confirmation } from '../../models'; +import { Confirmation, Toaster } from '../../models'; import { LocalizationService } from '@abp/ng.core'; @Component({ @@ -9,9 +9,9 @@ import { LocalizationService } from '@abp/ng.core'; styleUrls: ['./confirmation.component.scss'], }) export class ConfirmationComponent { - confirm = Confirmation.Status.confirm; - reject = Confirmation.Status.reject; - dismiss = Confirmation.Status.dismiss; + confirm = Toaster.Status.confirm; + reject = Toaster.Status.reject; + dismiss = Toaster.Status.dismiss; visible = false; @@ -56,7 +56,7 @@ export class ConfirmationComponent { }); } - close(status: Confirmation.Status) { + close(status: Toaster.Status) { this.confirmationService.clear(status); this.visible = false; } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts b/npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts index 67b6cf6ef7..6e890b8b19 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts @@ -21,10 +21,4 @@ export namespace Confirmation { } export type Severity = 'neutral' | 'success' | 'info' | 'warning' | 'error'; - - export enum Status { - confirm = 'confirm', - reject = 'reject', - dismiss = 'dismiss', - } } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts index b01c339a74..606ae83706 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts @@ -7,14 +7,14 @@ import { Config } from '@abp/ng.core'; @Injectable({ providedIn: 'root' }) export class ConfirmationService { - status$: Subject | Subject; + status$: Subject; confirmation$ = new ReplaySubject(1); info( message: Config.LocalizationParam, title: Config.LocalizationParam, options?: Partial, - ): Observable { + ): Observable { return this.show(message, title, 'info', options); } @@ -22,7 +22,7 @@ export class ConfirmationService { message: Config.LocalizationParam, title: Config.LocalizationParam, options?: Partial, - ): Observable { + ): Observable { return this.show(message, title, 'success', options); } @@ -30,7 +30,7 @@ export class ConfirmationService { message: Config.LocalizationParam, title: Config.LocalizationParam, options?: Partial, - ): Observable { + ): Observable { return this.show(message, title, 'warning', options); } @@ -38,7 +38,7 @@ export class ConfirmationService { message: Config.LocalizationParam, title: Config.LocalizationParam, options?: Partial, - ): Observable { + ): Observable { return this.show(message, title, 'error', options); } @@ -47,7 +47,7 @@ export class ConfirmationService { title: Config.LocalizationParam, severity?: Toaster.Severity, options?: Partial, - ): Observable { + ): Observable { this.listenToEscape(); this.confirmation$.next({ message, @@ -59,8 +59,8 @@ export class ConfirmationService { return this.status$; } - clear(status?: Toaster.Status | Confirmation.Status) { - this.status$.next(status || Confirmation.Status.dismiss); + clear(status?: Toaster.Status) { + this.status$.next(status || Toaster.Status.dismiss); } listenToEscape() {