From 871a6b1cd6d8133ea766f7f3e35699dc9996001d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 13 Jan 2021 15:33:00 +0200 Subject: [PATCH] Include search field in reset filter --- .../project-listing-screen.component.ts | 6 +++++- .../project-overview-screen.component.ts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts index 1eae42f94..adaa5e168 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts @@ -97,7 +97,10 @@ export class ProjectListingScreenComponent implements OnInit, OnDestroy { public get hasActiveFilters() { return ( - this._statusFilterComponent?.hasActiveFilters || this._peopleFilterComponent?.hasActiveFilters || this._needsWorkFilterComponent?.hasActiveFilters + this._statusFilterComponent?.hasActiveFilters || + this._peopleFilterComponent?.hasActiveFilters || + this._needsWorkFilterComponent?.hasActiveFilters || + this.searchForm.get('query').value ); } @@ -110,6 +113,7 @@ export class ProjectListingScreenComponent implements OnInit, OnDestroy { this._peopleFilterComponent.deactivateAllFilters(); this._needsWorkFilterComponent.deactivateAllFilters(); this.filtersChanged(); + this.searchForm.reset({ query: '' }); } private _calculateData() { 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 ba2cb8055..f1b888fac 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 @@ -159,7 +159,10 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { public get hasActiveFilters() { return ( - this._statusFilterComponent?.hasActiveFilters || this._peopleFilterComponent?.hasActiveFilters || this._needsWorkFilterComponent?.hasActiveFilters + this._statusFilterComponent?.hasActiveFilters || + this._peopleFilterComponent?.hasActiveFilters || + this._needsWorkFilterComponent?.hasActiveFilters || + this.searchForm.get('query').value ); } @@ -168,6 +171,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { this._peopleFilterComponent.deactivateAllFilters(); this._needsWorkFilterComponent.deactivateAllFilters(); this.filtersChanged(); + this.searchForm.reset({ query: '' }); } reloadProjects() {