Hotfix/advanced search fix (#180)

* Null checks * Test for null
dockstore · Jan 25, 2018 · 075df42 · 075df42
1 parent 30c985a
commit 075df42
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/app/search/search.component.html b/src/app/search/search.component.html
@@ -180,7 +180,7 @@
             </span>
           </div>
         </div>
-        <div class="alert alert-info" *ngIf="hits.length > query_size - 1 && searchService.hasNarrowedSearch(advancedSearchObject, searchTerm, hits, filters)">
+        <div class="alert alert-info" *ngIf="hits?.length > query_size - 1 && searchService.hasNarrowedSearch(advancedSearchObject, searchTerm, hits, filters)">
           <p><strong>Notice: </strong>Your search has returned greater than {{ query_size - 1 }} results, however only {{ query_size - 1 }} results are shown.
             We recommend that you narrow your search to find more relevant results.</p>
         </div>

diff --git a/src/app/search/search.service.spec.ts b/src/app/search/search.service.spec.ts
@@ -41,4 +41,8 @@ describe('SearchService', () => {
         expect(service.haveNoHits([])).toEqual(true);
         expect(service.haveNoHits([{'asdf': 'asdf'}])).toEqual(false);
     }));
+
+    it('should not crash on null advancedSearchObject', inject([SearchService], (service: SearchService) => {
+        expect(service.hasSearchText(null, null, null)).toEqual(false);
+    }));
 });
diff --git a/src/app/search/search.service.ts b/src/app/search/search.service.ts
@@ -77,7 +77,7 @@ export class SearchService {
       }
     );
 
-    if (searchInfo.searchTerm && !searchInfo.advancedSearchObject.toAdvanceSearch) {
+    if (searchInfo.searchTerm && (!searchInfo.advancedSearchObject || !searchInfo.advancedSearchObject.toAdvanceSearch)) {
       params.append('search', searchInfo.searchValues);
     } else {
       const advSearchKeys = Object.keys(searchInfo.advancedSearchObject);
@@ -259,9 +259,14 @@ export class SearchService {
   * (though not just the searchMode, which is set by default)
   */
   hasSearchText(advancedSearchObject: any, searchTerm: boolean, hits: any) {
-    const advSearchSet = ((advancedSearchObject.toAdvanceSearch) &&
-      (advancedSearchObject.ANDSplitFilter || advancedSearchObject.ANDNoSplitFilter
-        || advancedSearchObject.ORFilter || advancedSearchObject.NOTFilter));
+    let advSearchSet;
+    if (!advancedSearchObject) {
+      advSearchSet = false;
+    } else {
+      advSearchSet = ((advancedSearchObject.toAdvanceSearch) &&
+        (advancedSearchObject.ANDSplitFilter || advancedSearchObject.ANDNoSplitFilter
+          || advancedSearchObject.ORFilter || advancedSearchObject.NOTFilter));
+    }
     return (this.hasResults(searchTerm, hits) || advSearchSet);
   }