| ... |
... |
@@ -50,6 +50,7 @@ |
| 50 |
50 |
} else { |
| 51 |
51 |
this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); |
| 52 |
52 |
} |
|
53 |
+ console.log(this.rolesFilter); |
| 53 |
53 |
this[roleName] = !this[roleName]; |
| 54 |
54 |
this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); |
| 55 |
55 |
this.handleSearch(); |
| ... |
... |
@@ -58,10 +58,9 @@ |
| 58 |
58 |
this.searchText = e.target.value; |
| 59 |
59 |
} |
| 60 |
60 |
handleSearch() { |
| 61 |
|
- |
|
62 |
+ console.log(this.rolesFilter) |
| 62 |
62 |
if(this.searchText !== "") { |
| 63 |
63 |
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,7 +71,8 @@ |
| 71 |
71 |
this.results = wikiSearchResults; |
| 72 |
72 |
console.log(wikiSearchResults, collabSearchResults); |
| 73 |
73 |
}); |
| 74 |
|
- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
|
74 |
+ } else if (this.searchText === this.prevSearchText) { |
|
75 |
+ console.log("Only apply filter on results"); |
| 75 |
75 |
this.fetchFilterSearch().then(this.filterResults) |
| 76 |
76 |
} |
| 77 |
77 |
} else { |
| ... |
... |
@@ -83,6 +83,7 @@ |
| 83 |
83 |
} |
| 84 |
84 |
hasActiveFilters() { |
| 85 |
85 |
// we only look at role filters for POC. |
|
87 |
+ console.log('rolesfilter', this.rolesFilter); |
| 86 |
86 |
return this.rolesFilter.length > 0; |
| 87 |
87 |
} |
| 88 |
88 |
fetchWikiSearch() { |
| ... |
... |
@@ -94,7 +94,7 @@ |
| 94 |
94 |
if(this.hasActiveFilters()) { |
| 95 |
95 |
fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 96 |
96 |
} else { |
| 97 |
|
- resolve([]); |
|
99 |
+ resolve(null); |
| 98 |
98 |
} |
| 99 |
99 |
}); |
| 100 |
100 |
} |
| ... |
... |
@@ -102,7 +102,7 @@ |
| 102 |
102 |
console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
| 103 |
103 |
const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
| 104 |
104 |
const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
| 105 |
|
- this.results = filteredResults; |
|
107 |
+ console.log(filteredResults); |
| 106 |
106 |
} |
| 107 |
107 |
getLink(xwikiDocSpace) { |
| 108 |
108 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |