From 94bbd4c57d2ca0b4bf7befccc99e9589938206bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 25 Nov 2021 14:51:01 +0200 Subject: [PATCH] RED-2860: Fixed unassigned filters --- .../components/screen-header/screen-header.component.ts | 2 +- .../dossier/screens/dossier-overview/config.service.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts index 193eaefc8..d3d2cd8b0 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts @@ -86,7 +86,7 @@ export class ScreenHeaderComponent implements OnInit { 'hasUpdates', 'excluded', ], - fsv => ({ ...fsv, assignee: this._userService.getNameForId(fsv.currentReviewer) }), + fsv => ({ ...fsv, assignee: this._userService.getNameForId(fsv.assignee) }), ); }); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts index db8502aba..dcbf9efcf 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts @@ -248,7 +248,7 @@ export class ConfigService { label: this._translateService.instant('filters.assigned-people'), icon: 'red:user', filters: peopleFilters, - checker: keyChecker('currentReviewer'), + checker: keyChecker('assignee'), }); const needsWorkFilters = [...allDistinctNeedsWork].map( @@ -320,7 +320,7 @@ export class ConfigService { _assignedToMeChecker = (file: File) => file.assignee === this._userService.currentUser.id; - _unassignedChecker = (file: File) => file.isNew; + _unassignedChecker = (file: File) => !file.assignee; _assignedToOthersChecker = (file: File) => !file.isNew && file.assignee !== this._userService.currentUser.id;