| ... |
... |
@@ -58,8 +58,9 @@ |
| 58 |
58 |
setSearchText(e) { |
| 59 |
59 |
this.searchText = e.target.value; |
| 60 |
60 |
} |
| 61 |
|
- handleSearch(textSearch) { |
| 62 |
|
- if(this.searchText !== "" || textSearch) { |
|
61 |
+ handleSearch() { |
|
62 |
+ |
|
63 |
+ if(this.searchText !== "") { |
| 63 |
63 |
if(this.searchText !== this.prevSearchText) { |
| 64 |
64 |
this.prevSearchText = this.searchText; |
| 65 |
65 |
Promise.all([ |
| ... |
... |
@@ -72,11 +72,8 @@ |
| 72 |
72 |
}); |
| 73 |
73 |
} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 74 |
74 |
this.fetchFilterSearch().then(this.filterResults) |
| 75 |
|
- } else { |
| 76 |
|
- this.results = this.resultsCache; |
| 77 |
77 |
} |
| 78 |
78 |
} else { |
| 79 |
|
- this.clearResults(); |
| 80 |
80 |
console.log("no search text, should return filter search results if any"); |
| 81 |
81 |
this.fetchFilterSearch().then(collabs => { |
| 82 |
82 |
console.log("Format and display collabs", collabs); |
| ... |
... |
@@ -104,10 +104,6 @@ |
| 104 |
104 |
const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
| 105 |
105 |
this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
| 106 |
106 |
} |
| 107 |
|
- clearResults() { |
| 108 |
|
- this.results = []; |
| 109 |
|
- this.resultsCache = []; |
| 110 |
|
- } |
| 111 |
111 |
getLink(xwikiDocSpace) { |
| 112 |
112 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 113 |
113 |
} |
| ... |
... |
@@ -116,7 +116,7 @@ |
| 116 |
116 |
<div> |
| 117 |
117 |
<div> |
| 118 |
118 |
<input @change="${this.setSearchText}" type="text" placeholder="Search..." /> |
| 119 |
|
- <button @click="${() => this.handleSearch(true)}">Search</button> |
|
113 |
+ <button @click="${this.handleSearch}">Search</button> |
| 120 |
120 |
</div> |
| 121 |
121 |
<div> |
| 122 |
122 |
<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> |