| ... |
... |
@@ -50,7 +50,6 @@ |
| 50 |
50 |
} else { |
| 51 |
51 |
this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); |
| 52 |
52 |
} |
| 53 |
|
- console.log(this.rolesFilter); |
| 54 |
54 |
this[roleName] = !this[roleName]; |
| 55 |
55 |
this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); |
| 56 |
56 |
this.handleSearch(); |
| ... |
... |
@@ -59,9 +59,10 @@ |
| 59 |
59 |
this.searchText = e.target.value; |
| 60 |
60 |
} |
| 61 |
61 |
handleSearch() { |
| 62 |
|
- console.log(this.rolesFilter) |
|
61 |
+ |
| 63 |
63 |
if(this.searchText !== "") { |
| 64 |
64 |
if(this.searchText !== this.prevSearchText) { |
|
64 |
+ console.log("1st") |
| 65 |
65 |
console.log(this.searchText, this.prevSearchText); |
| 66 |
66 |
this.prevSearchText = this.searchText; |
| 67 |
67 |
Promise.all([ |
| ... |
... |
@@ -71,8 +71,7 @@ |
| 71 |
71 |
this.results = wikiSearchResults; |
| 72 |
72 |
console.log(wikiSearchResults, collabSearchResults); |
| 73 |
73 |
}); |
| 74 |
|
- } else if (this.searchText === this.prevSearchText) { |
| 75 |
|
- console.log("Only apply filter on results"); |
|
74 |
+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 76 |
76 |
this.fetchFilterSearch().then(this.filterResults) |
| 77 |
77 |
} |
| 78 |
78 |
} else { |
| ... |
... |
@@ -84,7 +84,6 @@ |
| 84 |
84 |
} |
| 85 |
85 |
hasActiveFilters() { |
| 86 |
86 |
// we only look at role filters for POC. |
| 87 |
|
- console.log('rolesfilter', this.rolesFilter); |
| 88 |
88 |
return this.rolesFilter.length > 0; |
| 89 |
89 |
} |
| 90 |
90 |
fetchWikiSearch() { |
| ... |
... |
@@ -104,7 +104,7 @@ |
| 104 |
104 |
console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
| 105 |
105 |
const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
| 106 |
106 |
const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
| 107 |
|
- console.log(filteredResults); |
|
105 |
+ this.results = filteredResults; |
| 108 |
108 |
} |
| 109 |
109 |
getLink(xwikiDocSpace) { |
| 110 |
110 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |