| ... |
... |
@@ -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) { |
| ... |
... |
@@ -58,21 +58,22 @@ |
| 58 |
58 |
this.searchText = e.target.value; |
| 59 |
59 |
} |
| 60 |
60 |
handleSearch() { |
|
61 |
+ console.log(this.rolesFilter) |
| 61 |
61 |
if(this.searchText !== "") { |
| 62 |
|
- if(this.searchText !== this.prevSearchText) { |
| 63 |
|
- console.log(this.searchText, this.prevSearchText); |
| 64 |
|
- this.prevSearchText = this.searchText; |
| 65 |
|
- Promise.all([ |
| 66 |
|
- this.fetchWikiSearch(), |
| 67 |
|
- this.fetchFilterSearch() |
| 68 |
|
- ]).then(([wikiSearchResults, collabSearchResults]) => { |
| 69 |
|
- this.results = wikiSearchResults; |
| 70 |
|
- console.log(wikiSearchResults, collabSearchResults); |
| 71 |
|
- }); |
| 72 |
|
- } else if (this.searchText === this.prevSearchText) { |
| 73 |
|
- console.log("Only apply filter on results"); |
| 74 |
|
- this.fetchFilterSearch().then(this.filterResults) |
| 75 |
|
- } |
|
63 |
+ if(this.searchText !== this.prevSearchText) { |
|
64 |
+ console.log(this.searchText, this.prevSearchText); |
|
65 |
+ this.prevSearchText = this.searchText; |
|
66 |
+ Promise.all([ |
|
67 |
+ this.fetchWikiSearch(), |
|
68 |
+ this.fetchFilterSearch() |
|
69 |
+ ]).then(([wikiSearchResults, collabSearchResults]) => { |
|
70 |
+ this.results = wikiSearchResults; |
|
71 |
+ console.log(wikiSearchResults, collabSearchResults); |
|
72 |
+ }); |
|
73 |
+ } else if (this.searchText === this.prevSearchText) { |
|
74 |
+ console.log("Only apply filter on results"); |
|
75 |
+ this.fetchFilterSearch().then(this.filterResults) |
|
76 |
+ } |
| 76 |
76 |
} else { |
| 77 |
77 |
console.log("no search text, should return filter search results if any"); |
| 78 |
78 |
this.fetchFilterSearch().then(collabs => { |