| ... |
... |
@@ -66,7 +66,6 @@ |
| 66 |
66 |
this.fetchWikiSearch(), |
| 67 |
67 |
this.fetchFilterSearch() |
| 68 |
68 |
]).then(([wikiSearchResults, collabSearchResults]) => { |
| 69 |
|
- this.results = wikiSearchResults; |
| 70 |
70 |
console.log(wikiSearchResults, collabSearchResults); |
| 71 |
71 |
}); |
| 72 |
72 |
} else if (this.searchText === this.prevSearchText) { |
| ... |
... |
@@ -82,8 +82,7 @@ |
| 82 |
82 |
} |
| 83 |
83 |
hasActiveFilters() { |
| 84 |
84 |
// we only look at role filters for POC. |
| 85 |
|
- console.log('rolesfilter', this.rolesFilter); |
| 86 |
|
- return this.rolesFilter.length > 0; |
|
84 |
+ return this.roles.length > 0; |
| 87 |
87 |
} |
| 88 |
88 |
fetchWikiSearch() { |
| 89 |
89 |
// request should be built from component, not from "external" dependency. Leave it here like this for POC. |
| ... |
... |
@@ -91,7 +91,7 @@ |
| 91 |
91 |
} |
| 92 |
92 |
fetchFilterSearch() { |
| 93 |
93 |
return new Promise((resolve) => { |
| 94 |
|
- if(this.hasActiveFilters()) { |
|
92 |
+ if(this.hasActiveFilters) { |
| 95 |
95 |
fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 96 |
96 |
} else { |
| 97 |
97 |
resolve(null); |
| ... |
... |
@@ -101,7 +101,7 @@ |
| 101 |
101 |
filterResults = (filteredCollabs) => { |
| 102 |
102 |
console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
| 103 |
103 |
const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
| 104 |
|
- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
|
102 |
+ const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space))); |
| 105 |
105 |
console.log(filteredResults); |
| 106 |
106 |
} |
| 107 |
107 |
getLink(xwikiDocSpace) { |