| ... |
... |
@@ -36,6 +36,7 @@ |
| 36 |
36 |
constructor() { |
| 37 |
37 |
super(); |
| 38 |
38 |
this.searchText = ""; |
|
39 |
+ this.prevSearchText = ""; |
| 39 |
39 |
this.administrator = false; |
| 40 |
40 |
this.editor = false; |
| 41 |
41 |
this.viewer = false; |
| ... |
... |
@@ -51,20 +51,28 @@ |
| 51 |
51 |
} |
| 52 |
52 |
this[roleName] = !this[roleName]; |
| 53 |
53 |
this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); |
| 54 |
|
- // if search text then apply filter |
| 55 |
|
- // else return filters result |
|
55 |
+ this.handleSearch(); |
| 56 |
56 |
} |
| 57 |
57 |
setSearchText(e) { |
| 58 |
58 |
this.searchText = e.target.value; |
| 59 |
59 |
} |
| 60 |
60 |
handleSearch() { |
| 61 |
|
- if(this.searchText !== "") { |
|
61 |
+ if(this.searchText !== "" && this.searchText !== this.prevSearchText) { |
|
62 |
+ this.prevSearchText = this.searchText; |
| 62 |
62 |
Promise.all([ |
| 63 |
63 |
this.fetchWikiSearch(), |
| 64 |
64 |
this.fetchFilterSearch() |
| 65 |
|
- ]) |
|
66 |
+ ]).then(([wikiSearchResults, collabSearchResults]) => { |
|
67 |
+ console.log(wikiSearchResults, collabSearchResults); |
|
68 |
+ }); |
|
69 |
+ } else if (this.searchText === this.prevSearchText) { |
|
70 |
+ console.log("Only apply filter on results"); |
|
71 |
+ this.fetchFilterSearch().then(res => res.json()).then(this.filterResults) |
| 66 |
66 |
} else { |
| 67 |
67 |
console.log("no search text, should return filter search results if any"); |
|
74 |
+ this.fetchFilterSearch().then(res => res.json()).then(collabs => { |
|
75 |
+ console.log("Format and display collabs", collabs); |
|
76 |
+ }) |
| 68 |
68 |
} |
| 69 |
69 |
} |
| 70 |
70 |
hasActiveFilters() { |
| ... |
... |
@@ -84,6 +84,9 @@ |
| 84 |
84 |
} |
| 85 |
85 |
}); |
| 86 |
86 |
} |
|
96 |
+ filterResults(filteredCollabs) { |
|
97 |
+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
|
98 |
+ } |
| 87 |
87 |
getLink(xwikiDocSpace) { |
| 88 |
88 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 89 |
89 |
} |