From 4fc0c92753a332066ac6781ea1ae5553f2e43cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 2 Nov 2020 05:48:21 +0200 Subject: [PATCH] Fixes --- apps/red-ui/src/app/common/filter/filter.component.ts | 2 +- .../project-overview-screen.component.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/common/filter/filter.component.ts b/apps/red-ui/src/app/common/filter/filter.component.ts index ab5f6a049..f1ea84a5b 100644 --- a/apps/red-ui/src/app/common/filter/filter.component.ts +++ b/apps/red-ui/src/app/common/filter/filter.component.ts @@ -70,7 +70,7 @@ export class FilterComponent implements OnChanges { this.filters?.forEach((f) => { f.checked = value; f.indeterminate = false; - f.filters.forEach((ff) => { + f.filters?.forEach((ff) => { ff.checked = value; }); }); diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts index d0f10690d..a4d53a3d7 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts @@ -365,20 +365,20 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { const statusFilterMatched = this._checkFilter( file, this.statusFilters, - (file: FileStatus, filter: FilterModel) => file.status === filter.key + (f: FileStatus, filter: FilterModel) => f.status === filter.key ); const peopleFilterMatched = this._checkFilter( file, this.peopleFilters, - (file: FileStatus, filter: FilterModel) => file.currentReviewer === filter.key + (f: FileStatus, filter: FilterModel) => f.currentReviewer === filter.key ); const addedFilterMatched = this._checkFilter( file, - this.peopleFilters, - (file: FileStatus, filter: FilterModel) => - moment(file.added).format('DD/MM/YYYY') === filter.key + this.addedDateFilters, + (f: FileStatus, filter: FilterModel) => + moment(f.added).format('DD/MM/YYYY') === filter.key ); if (statusFilterMatched && peopleFilterMatched && addedFilterMatched) {