| ... |
... |
@@ -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&limit=10000&favorite=false&roles=`); |
|
44 |
+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`); |
| 45 |
45 |
this.results = []; |
| 46 |
46 |
} |
| 47 |
47 |
toggleRoleFilter(roleName) { |
| ... |
... |
@@ -58,22 +58,17 @@ |
| 58 |
58 |
this.searchText = e.target.value; |
| 59 |
59 |
} |
| 60 |
60 |
handleSearch() { |
| 61 |
|
- console.log(this.rolesFilter) |
| 62 |
|
- if(this.searchText !== "") { |
| 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 |
|
- } |
|
61 |
+ if(this.searchText !== "" && this.searchText !== this.prevSearchText) { |
|
62 |
+ this.prevSearchText = this.searchText; |
|
63 |
+ Promise.all([ |
|
64 |
+ this.fetchWikiSearch(), |
|
65 |
+ this.fetchFilterSearch() |
|
66 |
+ ]).then(([wikiSearchResults, collabSearchResults]) => { |
|
67 |
+ console.log(wikiSearchResults, collabSearchResults); |
|
68 |
+ }); |
|
69 |
+ } else if (this.searchText === this.prevSearchText) { |
|
70 |
+ console.log("Only apply filter on results"); |
|
71 |
+ this.fetchFilterSearch().then(this.filterResults) |
| 77 |
77 |
} else { |
| 78 |
78 |
console.log("no search text, should return filter search results if any"); |
| 79 |
79 |
this.fetchFilterSearch().then(collabs => { |
| ... |
... |
@@ -83,8 +83,7 @@ |
| 83 |
83 |
} |
| 84 |
84 |
hasActiveFilters() { |
| 85 |
85 |
// we only look at role filters for POC. |
| 86 |
|
- console.log('rolesfilter', this.rolesFilter); |
| 87 |
|
- return this.rolesFilter.length > 0; |
|
81 |
+ return this.roles.length > 0; |
| 88 |
88 |
} |
| 89 |
89 |
fetchWikiSearch() { |
| 90 |
90 |
// request should be built from component, not from "external" dependency. Leave it here like this for POC. |
| ... |
... |
@@ -92,7 +92,7 @@ |
| 92 |
92 |
} |
| 93 |
93 |
fetchFilterSearch() { |
| 94 |
94 |
return new Promise((resolve) => { |
| 95 |
|
- if(this.hasActiveFilters()) { |
|
89 |
+ if(this.hasActiveFilters) { |
| 96 |
96 |
fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 97 |
97 |
} else { |
| 98 |
98 |
resolve(null); |
| ... |
... |
@@ -101,9 +101,6 @@ |
| 101 |
101 |
} |
| 102 |
102 |
filterResults = (filteredCollabs) => { |
| 103 |
103 |
console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); |
| 104 |
|
- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); |
| 105 |
|
- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); |
| 106 |
|
- console.log(filteredResults); |
| 107 |
107 |
} |
| 108 |
108 |
getLink(xwikiDocSpace) { |
| 109 |
109 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |