| ... |
... |
@@ -43,7 +43,6 @@ |
| 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) { |
| 49 |
49 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| ... |
... |
@@ -62,6 +62,8 @@ |
| 62 |
62 |
|
| 63 |
63 |
if(this.searchText !== "") { |
| 64 |
64 |
if(this.searchText !== this.prevSearchText) { |
|
64 |
+ console.log("1st") |
|
65 |
+ console.log(this.searchText, this.prevSearchText); |
| 65 |
65 |
this.prevSearchText = this.searchText; |
| 66 |
66 |
Promise.all([ |
| 67 |
67 |
this.fetchWikiSearch(), |
| ... |
... |
@@ -68,10 +68,10 @@ |
| 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()) { |
|
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 { |
| ... |
... |
@@ -99,8 +99,10 @@ |
| 99 |
99 |
}); |
| 100 |
100 |
} |
| 101 |
101 |
filterResults = (filteredCollabs) => { |
|
103 |
+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
| 102 |
102 |
const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
| 103 |
|
- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
|
105 |
+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
|
106 |
+ this.results = filteredResults; |
| 104 |
104 |
} |
| 105 |
105 |
getLink(xwikiDocSpace) { |
| 106 |
106 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |