| ... |
... |
@@ -58,7 +58,8 @@ |
| 58 |
58 |
this.searchText = e.target.value; |
| 59 |
59 |
} |
| 60 |
60 |
handleSearch() { |
| 61 |
|
- if(this.searchText !== "" && this.searchText !== this.prevSearchText) { |
|
61 |
+ if(this.searchText !== "") { |
|
62 |
+ if(this.searchText !== this.prevSearchText) { |
| 62 |
62 |
console.log(this.searchText, this.prevSearchText); |
| 63 |
63 |
this.prevSearchText = this.searchText; |
| 64 |
64 |
Promise.all([ |
| ... |
... |
@@ -65,11 +65,13 @@ |
| 65 |
65 |
this.fetchWikiSearch(), |
| 66 |
66 |
this.fetchFilterSearch() |
| 67 |
67 |
]).then(([wikiSearchResults, collabSearchResults]) => { |
|
69 |
+ this.results = wikiSearchResults; |
| 68 |
68 |
console.log(wikiSearchResults, collabSearchResults); |
| 69 |
69 |
}); |
| 70 |
70 |
} else if (this.searchText === this.prevSearchText) { |
| 71 |
71 |
console.log("Only apply filter on results"); |
| 72 |
72 |
this.fetchFilterSearch().then(this.filterResults) |
|
75 |
+ } |
| 73 |
73 |
} else { |
| 74 |
74 |
console.log("no search text, should return filter search results if any"); |
| 75 |
75 |
this.fetchFilterSearch().then(collabs => { |
| ... |
... |
@@ -79,7 +79,8 @@ |
| 79 |
79 |
} |
| 80 |
80 |
hasActiveFilters() { |
| 81 |
81 |
// we only look at role filters for POC. |
| 82 |
|
- return this.roles.length > 0; |
|
85 |
+ console.log('rolesfilter', this.rolesFilter); |
|
86 |
+ return this.rolesFilter.length > 0; |
| 83 |
83 |
} |
| 84 |
84 |
fetchWikiSearch() { |
| 85 |
85 |
// request should be built from component, not from "external" dependency. Leave it here like this for POC. |
| ... |
... |
@@ -87,7 +87,7 @@ |
| 87 |
87 |
} |
| 88 |
88 |
fetchFilterSearch() { |
| 89 |
89 |
return new Promise((resolve) => { |
| 90 |
|
- if(this.hasActiveFilters) { |
|
94 |
+ if(this.hasActiveFilters()) { |
| 91 |
91 |
fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 92 |
92 |
} else { |
| 93 |
93 |
resolve(null); |
| ... |
... |
@@ -96,6 +96,9 @@ |
| 96 |
96 |
} |
| 97 |
97 |
filterResults = (filteredCollabs) => { |
| 98 |
98 |
console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
|
103 |
+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
|
104 |
+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
|
105 |
+ console.log(filteredResults); |
| 99 |
99 |
} |
| 100 |
100 |
getLink(xwikiDocSpace) { |
| 101 |
101 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |