| ... |
... |
@@ -36,7 +36,6 @@ |
| 36 |
36 |
constructor() { |
| 37 |
37 |
super(); |
| 38 |
38 |
this.searchText = ""; |
| 39 |
|
- this.prevSearchText = ""; |
| 40 |
40 |
this.administrator = false; |
| 41 |
41 |
this.editor = false; |
| 42 |
42 |
this.viewer = false; |
| ... |
... |
@@ -52,7 +52,8 @@ |
| 52 |
52 |
} |
| 53 |
53 |
this[roleName] = !this[roleName]; |
| 54 |
54 |
this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); |
| 55 |
|
- this.handleSearch(); |
|
54 |
+ // if search text then apply filter |
|
55 |
+ // else return filters result |
| 56 |
56 |
} |
| 57 |
57 |
setSearchText(e) { |
| 58 |
58 |
this.searchText = e.target.value; |
| ... |
... |
@@ -59,24 +59,12 @@ |
| 59 |
59 |
} |
| 60 |
60 |
handleSearch() { |
| 61 |
61 |
if(this.searchText !== "") { |
| 62 |
|
- if(this.searchText !== this.prevSearchText) { |
| 63 |
|
- console.log(this.searchText, this.prevSearchText); |
| 64 |
|
- this.prevSearchText = this.searchText; |
| 65 |
65 |
Promise.all([ |
| 66 |
66 |
this.fetchWikiSearch(), |
| 67 |
67 |
this.fetchFilterSearch() |
| 68 |
|
- ]).then(([wikiSearchResults, collabSearchResults]) => { |
| 69 |
|
- console.log(wikiSearchResults, collabSearchResults); |
| 70 |
|
- }); |
| 71 |
|
- } else if (this.searchText === this.prevSearchText) { |
| 72 |
|
- console.log("Only apply filter on results"); |
| 73 |
|
- this.fetchFilterSearch().then(this.filterResults) |
| 74 |
|
- } |
|
65 |
+ ]) |
| 75 |
75 |
} else { |
| 76 |
76 |
console.log("no search text, should return filter search results if any"); |
| 77 |
|
- this.fetchFilterSearch().then(collabs => { |
| 78 |
|
- console.log("Format and display collabs", collabs); |
| 79 |
|
- }) |
| 80 |
80 |
} |
| 81 |
81 |
} |
| 82 |
82 |
hasActiveFilters() { |
| ... |
... |
@@ -89,16 +89,13 @@ |
| 89 |
89 |
} |
| 90 |
90 |
fetchFilterSearch() { |
| 91 |
91 |
return new Promise((resolve) => { |
| 92 |
|
- if(this.hasActiveFilters) { |
| 93 |
|
- fetch(this.filterUrl).then(res => res.json()).then(resolve); |
|
80 |
+ if(hasActiveFilters) { |
|
81 |
+ fetch(this.filterUrl).then(console.log); |
| 94 |
94 |
} else { |
| 95 |
95 |
resolve(null); |
| 96 |
96 |
} |
| 97 |
97 |
}); |
| 98 |
98 |
} |
| 99 |
|
- filterResults = (filteredCollabs) => { |
| 100 |
|
- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
| 101 |
|
- } |
| 102 |
102 |
getLink(xwikiDocSpace) { |
| 103 |
103 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 104 |
104 |
} |