refactor(theme-shared): add status enum to confirmation model and use it instead of toaster status enum

Author: thediaval

npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts

@@ -2,17 +2,16 @@ import { Component } from '@angular/core';
 import { ConfirmationService } from '../../services/confirmation.service';
 import { Confirmation } from '../../models/confirmation';
 import { LocalizationService } from '@abp/ng.core';
-import { Toaster } from '../../models/toaster';
 
 @Component({
  selector: 'abp-confirmation',
  templateUrl: './confirmation.component.html',
  styleUrls: ['./confirmation.component.scss'],
 })
 export class ConfirmationComponent {
- confirm = Toaster.Status.confirm;
- reject = Toaster.Status.reject;
- dismiss = Toaster.Status.dismiss;
+ confirm = Confirmation.Status.confirm;
+ reject = Confirmation.Status.reject;
+ dismiss = Confirmation.Status.dismiss;
 
  visible = false;
 
@@ -43,7 +42,7 @@ export class ConfirmationComponent {
  });
  }
 
- close(status: Toaster.Status) {
+ close(status: Confirmation.Status) {
  this.confirmationService.clear(status);
  }
 }

npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts

@@ -20,4 +20,10 @@ export namespace Confirmation {
  }
 
  export type Severity = 'neutral' | 'success' | 'info' | 'warning' | 'error';
+
+ export enum Status {
+ confirm = 'confirm',
+ reject = 'reject',
+ dismiss = 'dismiss',
+ }
 }

npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts

@@ -2,52 +2,51 @@ import { Injectable } from '@angular/core';
 import { Confirmation } from '../models/confirmation';
 import { fromEvent, Observable, Subject, ReplaySubject } from 'rxjs';
 import { takeUntil, debounceTime, filter } from 'rxjs/operators';
-import { Toaster } from '../models/toaster';
 import { Config } from '@abp/ng.core';
 
 @Injectable({ providedIn: 'root' })
 export class ConfirmationService {
- status$: Subject<Toaster.Status>;
+ status$: Subject<Confirmation.Status>;
  confirmation$ = new ReplaySubject<Confirmation.DialogData>(1);
 
  info(
  message: Config.LocalizationParam,
  title: Config.LocalizationParam,
  options?: Partial<Confirmation.Options>,
- ): Observable<Toaster.Status> {
+ ): Observable<Confirmation.Status> {
  return this.show(message, title, 'info', options);
  }
 
  success(
  message: Config.LocalizationParam,
  title: Config.LocalizationParam,
  options?: Partial<Confirmation.Options>,
- ): Observable<Toaster.Status> {
+ ): Observable<Confirmation.Status> {
  return this.show(message, title, 'success', options);
  }
 
  warn(
  message: Config.LocalizationParam,
  title: Config.LocalizationParam,
  options?: Partial<Confirmation.Options>,
- ): Observable<Toaster.Status> {
+ ): Observable<Confirmation.Status> {
  return this.show(message, title, 'warning', options);
  }
 
  error(
  message: Config.LocalizationParam,
  title: Config.LocalizationParam,
  options?: Partial<Confirmation.Options>,
- ): Observable<Toaster.Status> {
+ ): Observable<Confirmation.Status> {
  return this.show(message, title, 'error', options);
  }
 
  show(
  message: Config.LocalizationParam,
  title: Config.LocalizationParam,
- severity?: Toaster.Severity,
+ severity?: Confirmation.Severity,
  options?: Partial<Confirmation.Options>,
- ): Observable<Toaster.Status> {
+ ): Observable<Confirmation.Status> {
  this.confirmation$.next({
  message,
  title,
@@ -59,9 +58,9 @@ export class ConfirmationService {
  return this.status$;
  }
 
- clear(status?: Toaster.Status) {
+ clear(status?: Confirmation.Status) {
  this.confirmation$.next();
- this.status$.next(status || Toaster.Status.dismiss);
+ this.status$.next(status || Confirmation.Status.dismiss);
  }
 
  listenToEscape() {