Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RED-6802, fixed notification not appearing if emitted quickly.

Browse Source
This commit is contained in:
George 2023-06-21 19:30:52 +03:00
parent afbfaf2959
commit 1a8ab7b4b9
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/error/error.service.ts
View File

@ -2,7 +2,7 @@ import { inject, Injectable } from '@angular/core';
import { fromEvent, merge, Observable, Subject } from 'rxjs';
import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
import { LoadingService } from '../loading';
import { filter, map, tap } from 'rxjs/operators';
import { distinctUntilChanged, filter, map, tap } from 'rxjs/operators';
import { NavigationStart, Router } from '@angular/router';
import { shareLast } from '../utils';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@ -34,6 +34,8 @@ const OFFLINE_STATUSES = [
] as const;
const isOffline = (error?: ErrorType) => error instanceof HttpErrorResponse && OFFLINE_STATUSES.includes(error.status);
const isSameEventType = (previous: Event | string | undefined, current: Event | string | undefined) =>
previous instanceof Event && current instanceof Event ? previous.type === current.type : false;
@Injectable({ providedIn: 'root' })
export class ErrorService {
@ -48,7 +50,7 @@ export class ErrorService {
readonly #displayNotification$ = new Subject<string | undefined>();
// eslint-disable-next-line no-undef
#notificationTimeout: Record<string, NodeJS.Timeout | undefined> = {};
#lastDisplayedNotification: string | undefined;
#displayedNotificationType: string | undefined;
constructor() {
this.#router.events
@ -64,19 +66,15 @@ export class ErrorService {
this.online$ = this.#online();
this.connectionStatus$ = merge(this.online$, this.offline$, this.#displayNotification$).pipe(
distinctUntilChanged(isSameEventType),
filter(value => {
if (value instanceof Event) {
this.#clearNotificationTimeouts();
this.#setNotificationTimeout(value.type);
return false;
}
return true;
}),
map(value => {
const casted = value as string | undefined;
this.#lastDisplayedNotification = casted;
return casted;
if (!(value instanceof Event)) return true;
this.#clearNotificationTimeouts();
this.#setNotificationTimeout(value.type);
return false;
}),
map(value => value as string | undefined),
tap(value => (this.#displayedNotificationType = value)),
);
}
@ -101,11 +99,7 @@ export class ErrorService {
}
#setNotificationTimeout(status: string) {
if (status === 'online') {
if (this.#lastDisplayedNotification !== 'offline') {
return;
}
}
if (status === 'online' && this.#displayedNotificationType !== 'offline') return;
this.#notificationTimeout[status] ??= setTimeout(() => {
this.#displayNotification$.next(status);
if (status === 'online') {