Browse Source

refactor(theme-shared): remove Confirmation.Status enum

Removed to not commit any breaking changes.
pull/2606/head
TheDiaval 6 years ago
parent
commit
c94448e443
  1. 10
      npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts
  2. 6
      npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts
  3. 16
      npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts

10
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;
}

6
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',
}
}

16
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<Confirmation.Status> | Subject<Toaster.Status>;
status$: Subject<Toaster.Status>;
confirmation$ = new ReplaySubject<Confirmation.DialogData>(1);
info(
message: Config.LocalizationParam,
title: Config.LocalizationParam,
options?: Partial<Confirmation.Options>,
): Observable<Confirmation.Status | Toaster.Status> {
): Observable<Toaster.Status> {
return this.show(message, title, 'info', options);
}
@ -22,7 +22,7 @@ export class ConfirmationService {
message: Config.LocalizationParam,
title: Config.LocalizationParam,
options?: Partial<Confirmation.Options>,
): Observable<Confirmation.Status | Toaster.Status> {
): Observable<Toaster.Status> {
return this.show(message, title, 'success', options);
}
@ -30,7 +30,7 @@ export class ConfirmationService {
message: Config.LocalizationParam,
title: Config.LocalizationParam,
options?: Partial<Confirmation.Options>,
): Observable<Confirmation.Status | Toaster.Status> {
): Observable<Toaster.Status> {
return this.show(message, title, 'warning', options);
}
@ -38,7 +38,7 @@ export class ConfirmationService {
message: Config.LocalizationParam,
title: Config.LocalizationParam,
options?: Partial<Confirmation.Options>,
): Observable<Confirmation.Status | Toaster.Status> {
): Observable<Toaster.Status> {
return this.show(message, title, 'error', options);
}
@ -47,7 +47,7 @@ export class ConfirmationService {
title: Config.LocalizationParam,
severity?: Toaster.Severity,
options?: Partial<Confirmation.Options>,
): Observable<Confirmation.Status | Toaster.Status> {
): Observable<Toaster.Status> {
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() {

Loading…
Cancel
Save