| ... |
... |
@@ -43,6 +43,7 @@ |
| 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 = []; |
| 46 |
46 |
} |
| 47 |
47 |
toggleRoleFilter(roleName) { |
| 48 |
48 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| ... |
... |
@@ -57,12 +57,10 @@ |
| 57 |
57 |
setSearchText(e) { |
| 58 |
58 |
this.searchText = e.target.value; |
| 59 |
59 |
} |
| 60 |
|
- handleSearch() { |
| 61 |
61 |
|
|
62 |
+ handleSearch() { |
| 62 |
62 |
if(this.searchText !== "") { |
| 63 |
63 |
if(this.searchText !== this.prevSearchText) { |
| 64 |
|
- console.log("1st") |
| 65 |
|
- console.log(this.searchText, this.prevSearchText); |
| 66 |
66 |
this.prevSearchText = this.searchText; |
| 67 |
67 |
Promise.all([ |
| 68 |
68 |
this.fetchWikiSearch(), |
| ... |
... |
@@ -69,12 +69,16 @@ |
| 69 |
69 |
this.fetchFilterSearch() |
| 70 |
70 |
]).then(([wikiSearchResults, collabSearchResults]) => { |
| 71 |
71 |
this.results = wikiSearchResults; |
|
71 |
+ this.resultsCache = wikiSearchResults; |
| 72 |
72 |
console.log(wikiSearchResults, collabSearchResults); |
| 73 |
73 |
}); |
| 74 |
74 |
} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 75 |
75 |
this.fetchFilterSearch().then(this.filterResults) |
|
76 |
+ } else { |
|
77 |
+ this.results = this.resultsCache; |
| 76 |
76 |
} |
| 77 |
77 |
} else { |
|
80 |
+ this.clearResults(); |
| 78 |
78 |
console.log("no search text, should return filter search results if any"); |
| 79 |
79 |
this.fetchFilterSearch().then(collabs => { |
| 80 |
80 |
console.log("Format and display collabs", collabs); |
| ... |
... |
@@ -99,11 +99,13 @@ |
| 99 |
99 |
}); |
| 100 |
100 |
} |
| 101 |
101 |
filterResults = (filteredCollabs) => { |
| 102 |
|
- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
| 103 |
103 |
const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
| 104 |
|
- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
| 105 |
|
- this.results = filteredResults; |
|
106 |
+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
| 106 |
106 |
} |
|
108 |
+ clearResults() { |
|
109 |
+ this.results = []; |
|
110 |
+ this.resultsCache = []; |
|
111 |
+ } |
| 107 |
107 |
getLink(xwikiDocSpace) { |
| 108 |
108 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 109 |
109 |
} |