| ... |
... |
@@ -43,14 +43,15 @@ |
| 43 |
43 |
this.rolesFilter = []; |
| 44 |
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 |
|
- this.resultsCache = []; |
| 47 |
47 |
} |
| 48 |
48 |
toggleRoleFilter(roleName) { |
|
48 |
+ console.log("toggleRoleFilter", roleName, this.rolesFilter, this.rolesFilter.indexOf(roleName)); |
| 49 |
49 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| 50 |
50 |
this.rolesFilter.push(roleName); |
| 51 |
51 |
} else { |
| 52 |
|
- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); |
|
52 |
+ this.rolesFilter.filter(role => role !== roleName); |
| 53 |
53 |
} |
|
54 |
+ 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 |
|
- |
|
63 |
+ console.log(this.rolesFilter) |
| 63 |
63 |
if(this.searchText !== "") { |
| 64 |
64 |
if(this.searchText !== this.prevSearchText) { |
|
66 |
+ console.log(this.searchText, this.prevSearchText); |
| 65 |
65 |
this.prevSearchText = this.searchText; |
| 66 |
66 |
Promise.all([ |
| 67 |
67 |
this.fetchWikiSearch(), |
| ... |
... |
@@ -68,13 +68,11 @@ |
| 68 |
68 |
this.fetchFilterSearch() |
| 69 |
69 |
]).then(([wikiSearchResults, collabSearchResults]) => { |
| 70 |
70 |
this.results = wikiSearchResults; |
| 71 |
|
- this.resultsCache = wikiSearchResults; |
| 72 |
72 |
console.log(wikiSearchResults, collabSearchResults); |
| 73 |
73 |
}); |
| 74 |
|
- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
|
75 |
+ } else if (this.searchText === this.prevSearchText) { |
|
76 |
+ console.log("Only apply filter on results"); |
| 75 |
75 |
this.fetchFilterSearch().then(this.filterResults) |
| 76 |
|
- } else { |
| 77 |
|
- this.results = this.resultsCache; |
| 78 |
78 |
} |
| 79 |
79 |
} else { |
| 80 |
80 |
console.log("no search text, should return filter search results if any"); |
| ... |
... |
@@ -85,6 +85,7 @@ |
| 85 |
85 |
} |
| 86 |
86 |
hasActiveFilters() { |
| 87 |
87 |
// we only look at role filters for POC. |
|
88 |
+ console.log('rolesfilter', this.rolesFilter); |
| 88 |
88 |
return this.rolesFilter.length > 0; |
| 89 |
89 |
} |
| 90 |
90 |
fetchWikiSearch() { |
| ... |
... |
@@ -96,13 +96,15 @@ |
| 96 |
96 |
if(this.hasActiveFilters()) { |
| 97 |
97 |
fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 98 |
98 |
} else { |
| 99 |
|
- resolve([]); |
|
100 |
+ resolve(null); |
| 100 |
100 |
} |
| 101 |
101 |
}); |
| 102 |
102 |
} |
| 103 |
103 |
filterResults = (filteredCollabs) => { |
|
105 |
+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
| 104 |
104 |
const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
| 105 |
|
- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
|
107 |
+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
|
108 |
+ console.log(filteredResults); |
| 106 |
106 |
} |
| 107 |
107 |
getLink(xwikiDocSpace) { |
| 108 |
108 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |