Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -43,7 +42,7 @@ export class ConfirmationComponent {
});
}

close(status: Toaster.Status) {
close(status: Confirmation.Status) {
this.confirmationService.clear(status);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,10 @@ export namespace Confirmation {
}

export type Severity = 'neutral' | 'success' | 'info' | 'warning' | 'error';

export enum Status {
confirm = 'confirm',
reject = 'reject',
dismiss = 'dismiss',
}
}
3 changes: 3 additions & 0 deletions npm/ng-packs/packages/theme-shared/src/lib/models/toaster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ export namespace Toaster {

export type Severity = 'neutral' | 'success' | 'info' | 'warning' | 'error';

/**
* @deprecated Status will be removed from toaster model in v2.2
*/
export enum Status {
confirm = 'confirm',
reject = 'reject',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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() {
Expand Down