diff --git a/lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.ts b/lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.ts index 56fc5fd38c..fc39105682 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.ts @@ -50,8 +50,8 @@ export class ProcessFilterCloudService { private filterKeyToBeRefreshedSource = new Subject(); filterKeyToBeRefreshed$: Observable = this.filterKeyToBeRefreshedSource.asObservable(); - private readonly preferenceService = inject(PROCESS_FILTERS_SERVICE_TOKEN); - private readonly identityUserService = inject(IdentityUserService); + protected readonly preferenceService = inject(PROCESS_FILTERS_SERVICE_TOKEN); + protected readonly identityUserService = inject(IdentityUserService); private readonly notificationCloudService = inject(NotificationCloudService); constructor() { @@ -342,7 +342,7 @@ export class ProcessFilterCloudService { * @param appName Name of the target app * @returns String of process instance filters preference key */ - private prepareKey(appName: string): string { + protected prepareKey(appName: string): string { const user = this.identityUserService.getCurrentUserInfo(); return `process-filters-${appName}-${user.username}`; } diff --git a/lib/process-services-cloud/src/lib/task/task-filters/services/service-task-filter-cloud.service.ts b/lib/process-services-cloud/src/lib/task/task-filters/services/service-task-filter-cloud.service.ts index ed4a5f5c0b..f6b91ebacf 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/services/service-task-filter-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/services/service-task-filter-cloud.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Injectable, Inject } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable, of, BehaviorSubject } from 'rxjs'; import { ServiceTaskFilterCloudModel } from '../models/filter-cloud.model'; import { switchMap, map } from 'rxjs/operators'; @@ -27,14 +27,11 @@ import { IdentityUserService } from '../../../people/services/identity-user.serv providedIn: 'root' }) export class ServiceTaskFilterCloudService { - private filtersSubject = new BehaviorSubject([]); - filters$ = this.filtersSubject.asObservable(); + private readonly filtersSubject = new BehaviorSubject([]); + readonly filters$ = this.filtersSubject.asObservable(); - constructor( - private identityUserService: IdentityUserService, - @Inject(TASK_FILTERS_SERVICE_TOKEN) - public preferenceService: PreferenceCloudServiceInterface - ) {} + protected readonly preferenceService = inject(TASK_FILTERS_SERVICE_TOKEN); + protected readonly identityUserService = inject(IdentityUserService); /** * Creates and returns the default task filters for an app. @@ -242,7 +239,7 @@ export class ServiceTaskFilterCloudService { * @param appName Name of the target app * @returns String of task filters preference key */ - private prepareKey(appName: string): string { + protected prepareKey(appName: string): string { return `service-task-filters-${appName}-${this.identityUserService.getCurrentUserInfo().username}`; } diff --git a/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.ts b/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.ts index 1c00ffedbf..a509927908 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Injectable, Inject } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable, of, BehaviorSubject, throwError, Subject } from 'rxjs'; import { TaskFilterCloudModel } from '../models/filter-cloud.model'; import { switchMap, map } from 'rxjs/operators'; @@ -48,15 +48,16 @@ const TASK_EVENT_SUBSCRIPTION_QUERY = ` providedIn: 'root' }) export class TaskFilterCloudService extends BaseCloudService { + public preferenceService = inject(TASK_FILTERS_SERVICE_TOKEN); + + protected identityUserService = inject(IdentityUserService); + private filtersSubject = new BehaviorSubject([]); filters$ = this.filtersSubject.asObservable(); private filterKeyToBeRefreshedSource = new Subject(); filterKeyToBeRefreshed$ = this.filterKeyToBeRefreshedSource.asObservable(); constructor( - private identityUserService: IdentityUserService, - @Inject(TASK_FILTERS_SERVICE_TOKEN) - public preferenceService: PreferenceCloudServiceInterface, private notificationCloudService: NotificationCloudService, adfHttpClient: AdfHttpClient ) { @@ -307,7 +308,7 @@ export class TaskFilterCloudService extends BaseCloudService { * @param appName Name of the target app * @returns String of task filters preference key */ - private prepareKey(appName: string): string { + protected prepareKey(appName: string): string { return `task-filters-${appName}-${this.identityUserService.getCurrentUserInfo().username}`; }