Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Pull request #93: RED-920: Include search field in reset filter

Browse Source 
Merge in RED/ui from RED-920 to master

* commit '871a6b1cd6d8133ea766f7f3e35699dc9996001d':
  Include search field in reset filter
This commit is contained in:
Timo Bejan 2021-01-13 16:35:50 +01:00
commit 81f3d36862
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts
View File

@ -97,7 +97,10 @@ export class ProjectListingScreenComponent implements OnInit, OnDestroy {
public get hasActiveFilters() { public get hasActiveFilters() {
return ( 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._peopleFilterComponent.deactivateAllFilters();
this._needsWorkFilterComponent.deactivateAllFilters(); this._needsWorkFilterComponent.deactivateAllFilters();
this.filtersChanged(); this.filtersChanged();
this.searchForm.reset({ query: '' });
} }
private _calculateData() { private _calculateData() {

6
apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
View File

@ -159,7 +159,10 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
public get hasActiveFilters() { public get hasActiveFilters() {
return ( 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._peopleFilterComponent.deactivateAllFilters();
this._needsWorkFilterComponent.deactivateAllFilters(); this._needsWorkFilterComponent.deactivateAllFilters();
this.filtersChanged(); this.filtersChanged();
this.searchForm.reset({ query: '' });
} }
reloadProjects() { reloadProjects() {