| ... |
... |
@@ -52,14 +52,15 @@ |
| 52 |
52 |
} |
| 53 |
53 |
this[roleName] = !this[roleName]; |
| 54 |
54 |
this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); |
| 55 |
|
- // if search text then apply filter |
| 56 |
|
- // else return filters result |
|
55 |
+ this.handleSearch(); |
| 57 |
57 |
} |
| 58 |
58 |
setSearchText(e) { |
| 59 |
59 |
this.searchText = e.target.value; |
| 60 |
60 |
} |
| 61 |
61 |
handleSearch() { |
| 62 |
|
- if(this.searchText !== "" && this.searchText !== this.prevSearchText) { |
|
61 |
+ if(this.searchText !== "") { |
|
62 |
+ if(this.searchText !== this.prevSearchText) { |
|
63 |
+ console.log(this.searchText, this.prevSearchText); |
| 63 |
63 |
this.prevSearchText = this.searchText; |
| 64 |
64 |
Promise.all([ |
| 65 |
65 |
this.fetchWikiSearch(), |
| ... |
... |
@@ -69,10 +69,11 @@ |
| 69 |
69 |
}); |
| 70 |
70 |
} else if (this.searchText === this.prevSearchText) { |
| 71 |
71 |
console.log("Only apply filter on results"); |
| 72 |
|
- this.fetchFilterSearch().then(res => res.json()).then(this.filterResults) |
|
73 |
+ this.fetchFilterSearch().then(this.filterResults) |
|
74 |
+ } |
| 73 |
73 |
} else { |
| 74 |
74 |
console.log("no search text, should return filter search results if any"); |
| 75 |
|
- this.fetchFilterSearch().then(res => res.json()).then(collabs => { |
|
77 |
+ this.fetchFilterSearch().then(collabs => { |
| 76 |
76 |
console.log("Format and display collabs", collabs); |
| 77 |
77 |
}) |
| 78 |
78 |
} |
| ... |
... |
@@ -87,15 +87,18 @@ |
| 87 |
87 |
} |
| 88 |
88 |
fetchFilterSearch() { |
| 89 |
89 |
return new Promise((resolve) => { |
| 90 |
|
- if(hasActiveFilters) { |
| 91 |
|
- fetch(this.filterUrl).then(console.log); |
|
92 |
+ if(this.hasActiveFilters) { |
|
93 |
+ fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 92 |
92 |
} else { |
| 93 |
93 |
resolve(null); |
| 94 |
94 |
} |
| 95 |
95 |
}); |
| 96 |
96 |
} |
| 97 |
|
- filterResults(filteredCollabs) { |
|
99 |
+ filterResults = (filteredCollabs) => { |
| 98 |
98 |
console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
|
101 |
+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
|
102 |
+ const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space))); |
|
103 |
+ console.log(filteredResults); |
| 99 |
99 |
} |
| 100 |
100 |
getLink(xwikiDocSpace) { |
| 101 |
101 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |