From e600d437e3c5aa230b16e123900eab8d345af153 Mon Sep 17 00:00:00 2001 From: Suzana Dirla Date: Tue, 26 Jun 2018 15:11:33 +0300 Subject: [PATCH] [ACA-1489] Handling cleared searches and searches with no results (#460) * skip search action when no searchTerm * hide search filters when no results --- src/app/components/search-input/search-input.component.ts | 8 ++++++-- src/app/components/search/search.component.html | 4 +++- src/app/components/search/search.component.scss | 4 ++++ src/app/components/search/search.component.ts | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/app/components/search-input/search-input.component.ts b/src/app/components/search-input/search-input.component.ts index ad8455fcc..2285cf376 100644 --- a/src/app/components/search-input/search-input.component.ts +++ b/src/app/components/search-input/search-input.component.ts @@ -112,7 +112,9 @@ export class SearchInputComponent implements OnInit { */ onSearchSubmit(event: KeyboardEvent) { const searchTerm = (event.target as HTMLInputElement).value; - this.store.dispatch(new SearchByTermAction(searchTerm)); + if (searchTerm) { + this.store.dispatch(new SearchByTermAction(searchTerm)); + } } onSearchChange(searchTerm: string) { @@ -130,7 +132,9 @@ export class SearchInputComponent implements OnInit { } this.navigationTimer = setTimeout(() => { - this.store.dispatch(new SearchByTermAction(searchTerm)); + if (searchTerm) { + this.store.dispatch(new SearchByTermAction(searchTerm)); + } this.hasOneChange = false; }, 1000); } diff --git a/src/app/components/search/search.component.html b/src/app/components/search/search.component.html index dca4e21e7..e6a189838 100644 --- a/src/app/components/search/search.component.html +++ b/src/app/components/search/search.component.html @@ -66,7 +66,9 @@
- +
diff --git a/src/app/components/search/search.component.scss b/src/app/components/search/search.component.scss index 2ba9bb18c..6a201a3b1 100644 --- a/src/app/components/search/search.component.scss +++ b/src/app/components/search/search.component.scss @@ -34,6 +34,10 @@ padding: 5px; height: 100%; overflow: scroll; + + &--hidden { + display: none; + } } .text--bold { diff --git a/src/app/components/search/search.component.ts b/src/app/components/search/search.component.ts index c438a2454..895885ff9 100644 --- a/src/app/components/search/search.component.ts +++ b/src/app/components/search/search.component.ts @@ -87,7 +87,8 @@ export class SearchComponent extends PageComponent implements OnInit { this.queryBuilder.userQuery = query; this.queryBuilder.update(); } else { - this.onSearchResultLoaded( {list: { pagination: { totalItems: 0 }, entries: []}} ); + this.queryBuilder.userQuery = null; + this.queryBuilder.executed.next( {list: { pagination: { totalItems: 0 }, entries: []}} ); } }); }