| ... |
... |
@@ -61,16 +61,15 @@ |
| 61 |
61 |
handleSearch(textSearch) { |
| 62 |
62 |
if(this.searchText !== "" || textSearch) { |
| 63 |
63 |
if(this.searchText !== this.prevSearchText) { |
| 64 |
|
- this.clearResults(); |
| 65 |
65 |
this.prevSearchText = this.searchText; |
| 66 |
|
- this.fetchWikiSearch().then(results => { |
| 67 |
|
- this.resultsCache = results; |
| 68 |
|
- if(this.hasActiveFilters()) { |
| 69 |
|
- this.fetchFilterSearch().then(this.filterResults); |
| 70 |
|
- } else { |
| 71 |
|
- this.results = results; |
| 72 |
|
- } |
| 73 |
|
- }) |
|
65 |
+ Promise.all([ |
|
66 |
+ this.fetchWikiSearch(), |
|
67 |
+ this.fetchFilterSearch() |
|
68 |
+ ]).then(([wikiSearchResults, collabSearchResults]) => { |
|
69 |
+ this.results = wikiSearchResults; |
|
70 |
+ this.resultsCache = wikiSearchResults; |
|
71 |
+ console.log(wikiSearchResults, collabSearchResults); |
|
72 |
+ }); |
| 74 |
74 |
} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 75 |
75 |
this.fetchFilterSearch().then(this.filterResults) |
| 76 |
76 |
} else { |
| ... |
... |
@@ -117,7 +117,7 @@ |
| 117 |
117 |
<div> |
| 118 |
118 |
<div> |
| 119 |
119 |
<input @change="${this.setSearchText}" type="text" placeholder="Search..." /> |
| 120 |
|
- <button @click="${() => this.handleSearch(true)}">Search</button> |
|
119 |
+ <button @click="${this.handleSearch}">Search</button> |
| 121 |
121 |
</div> |
| 122 |
122 |
<div> |
| 123 |
123 |
<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> |