| ... |
... |
@@ -41,7 +41,7 @@ |
| 41 |
41 |
this.editor = false; |
| 42 |
42 |
this.viewer = false; |
| 43 |
43 |
this.rolesFilter = []; |
| 44 |
|
- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`); |
|
44 |
+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); |
| 45 |
45 |
this.results = []; |
| 46 |
46 |
} |
| 47 |
47 |
toggleRoleFilter(roleName) { |
| ... |
... |
@@ -51,6 +51,7 @@ |
| 51 |
51 |
this.rolesFilter.filter(role => role !== roleName); |
| 52 |
52 |
} |
| 53 |
53 |
this[roleName] = !this[roleName]; |
|
54 |
+ console.log(this.rolesFilter); |
| 54 |
54 |
this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); |
| 55 |
55 |
this.handleSearch(); |
| 56 |
56 |
} |
| ... |
... |
@@ -66,6 +66,7 @@ |
| 66 |
66 |
this.fetchWikiSearch(), |
| 67 |
67 |
this.fetchFilterSearch() |
| 68 |
68 |
]).then(([wikiSearchResults, collabSearchResults]) => { |
|
70 |
+ this.results = wikiSearchResults; |
| 69 |
69 |
console.log(wikiSearchResults, collabSearchResults); |
| 70 |
70 |
}); |
| 71 |
71 |
} else if (this.searchText === this.prevSearchText) { |
| ... |
... |
@@ -81,7 +81,8 @@ |
| 81 |
81 |
} |
| 82 |
82 |
hasActiveFilters() { |
| 83 |
83 |
// we only look at role filters for POC. |
| 84 |
|
- return this.roles.length > 0; |
|
86 |
+ console.log('rolesfilter', this.rolesFilter); |
|
87 |
+ return this.rolesFilter.length > 0; |
| 85 |
85 |
} |
| 86 |
86 |
fetchWikiSearch() { |
| 87 |
87 |
// request should be built from component, not from "external" dependency. Leave it here like this for POC. |
| ... |
... |
@@ -89,7 +89,7 @@ |
| 89 |
89 |
} |
| 90 |
90 |
fetchFilterSearch() { |
| 91 |
91 |
return new Promise((resolve) => { |
| 92 |
|
- if(this.hasActiveFilters) { |
|
95 |
+ if(this.hasActiveFilters()) { |
| 93 |
93 |
fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 94 |
94 |
} else { |
| 95 |
95 |
resolve(null); |
| ... |
... |
@@ -98,6 +98,9 @@ |
| 98 |
98 |
} |
| 99 |
99 |
filterResults = (filteredCollabs) => { |
| 100 |
100 |
console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
|
104 |
+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
|
105 |
+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
|
106 |
+ console.log(filteredResults); |
| 101 |
101 |
} |
| 102 |
102 |
getLink(xwikiDocSpace) { |
| 103 |
103 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |