From 9a8e33779021e534c4c603d58c59e7f7ca44126b Mon Sep 17 00:00:00 2001 From: George Date: Mon, 10 Jul 2023 15:32:29 +0300 Subject: [PATCH] RED-6408, rewrite filters service with signals. TODO: Modify its usage everywhere in the codebase. --- .../dossier-details/dossier-details.component.ts | 7 ++++--- libs/common-ui | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts index eb401f1d0..64d89c1f9 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, computed, EventEmitter, Input, Output } from '@angular/core'; import { DonutChartConfig, Dossier, @@ -25,6 +25,7 @@ import { Roles } from '@users/roles'; import { getCurrentUser } from '@iqser/common-ui/lib/users'; import { FilterService, INestedFilter } from '@iqser/common-ui/lib/filtering'; import { ContextComponent, getParam, shareLast } from '@iqser/common-ui/lib/utils'; +import { toObservable } from '@angular/core/rxjs-interop'; interface DossierDetailsContext { needsWorkFilters: INestedFilter[] | undefined; @@ -69,9 +70,9 @@ export class DossierDetailsComponent extends ContextComponent stats), ); const statusConfig$ = dossierStats$.pipe(map(stats => this.#calculateStatusConfig(stats))); - + const filterModels$ = toObservable(computed(() => filterService.getFilterModels('needsWorkFilters'))); super._initContext({ - needsWorkFilters: filterService.getFilterModels$('needsWorkFilters'), + needsWorkFilters: filterModels$, dossier: dossier$, dossierStats: dossierStatsWithEffects$, statusConfig: statusConfig$, diff --git a/libs/common-ui b/libs/common-ui index a4e425d37..9e0c31992 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit a4e425d3739d6145325a8fe347d9fcae1e12a662 +Subproject commit 9e0c31992a8185a90b161e7030272e48451761e7