diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters/process-filters-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters/process-filters-cloud.component.ts index bc112e1a83..c4812b22f8 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters/process-filters-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters/process-filters-cloud.component.ts @@ -16,7 +16,7 @@ */ import { Component, DestroyRef, EventEmitter, inject, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; -import { combineLatest, defer, EMPTY, Observable, Subscription } from 'rxjs'; +import { combineLatest, defer, EMPTY, Observable, of, Subscription } from 'rxjs'; import { ProcessFilterCloudService } from '../../services/process-filter-cloud.service'; import { ProcessFilterCloudModel } from '../../models/process-filter-cloud.model'; import { AppConfigService, IconModule, TranslationService } from '@alfresco/adf-core'; @@ -131,7 +131,7 @@ export class ProcessFiltersCloudComponent implements OnInit, OnChanges { getFilters(appName: string): void { this.filtersLoadedFor = appName; const filters$ = this.filterCountersCloudService.getProcessFilters(appName); - this.filters$ = filters$.pipe(catchError(() => EMPTY)); + this.filters$ = filters$.pipe(catchError(() => of([]))); filters$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe({ next: (res) => { diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters/task-filters-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters/task-filters-cloud.component.ts index 86531496b2..885148e62c 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters/task-filters-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters/task-filters-cloud.component.ts @@ -176,22 +176,18 @@ export class TaskFiltersCloudComponent extends BaseTaskFiltersCloudComponent imp }); } - initFilterCounterNotifications() { - if (!this.appName) { - return; - } - if (!this.enableNotifications) { + initFilterCounterNotifications(): void { + if (this.appName && this.enableNotifications) { + this.filterCountersCloudService + .getEngineEvents(this.appName, FilterCounterEntityType.TASK) + .pipe(takeUntilDestroyed(this.destroyRef)) + .subscribe((events) => { + events.forEach((taskEvent) => this.checkFilterCounter(taskEvent.entity)); + this.filterCounterUpdated.emit(events); + }); + } else { this.counters = {}; - return; } - - this.filterCountersCloudService - .getEngineEvents(this.appName, FilterCounterEntityType.TASK) - .pipe(takeUntilDestroyed(this.destroyRef)) - .subscribe((events) => { - events.forEach((taskEvent) => this.checkFilterCounter(taskEvent.entity)); - this.filterCounterUpdated.emit(events); - }); } checkFilterCounter(filterNotification: TaskDetailsCloudModel) {