| ... |
... |
@@ -36,12 +36,11 @@ |
| 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; |
| 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=`); |
|
43 |
+ 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) { |
| ... |
... |
@@ -51,9 +51,9 @@ |
| 51 |
51 |
this.rolesFilter.filter(role => role !== roleName); |
| 52 |
52 |
} |
| 53 |
53 |
this[roleName] = !this[roleName]; |
| 54 |
|
- console.log(this.rolesFilter); |
| 55 |
55 |
this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); |
| 56 |
|
- this.handleSearch(); |
|
54 |
+ // if search text then apply filter |
|
55 |
+ // else return filters result |
| 57 |
57 |
} |
| 58 |
58 |
setSearchText(e) { |
| 59 |
59 |
this.searchText = e.target.value; |
| ... |
... |
@@ -60,31 +60,17 @@ |
| 60 |
60 |
} |
| 61 |
61 |
handleSearch() { |
| 62 |
62 |
if(this.searchText !== "") { |
| 63 |
|
- if(this.searchText !== this.prevSearchText) { |
| 64 |
|
- console.log(this.searchText, this.prevSearchText); |
| 65 |
|
- this.prevSearchText = this.searchText; |
| 66 |
66 |
Promise.all([ |
| 67 |
67 |
this.fetchWikiSearch(), |
| 68 |
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 |
|
- } |
|
65 |
+ ]) |
| 77 |
77 |
} else { |
| 78 |
78 |
console.log("no search text, should return filter search results if any"); |
| 79 |
|
- this.fetchFilterSearch().then(collabs => { |
| 80 |
|
- console.log("Format and display collabs", collabs); |
| 81 |
|
- }) |
| 82 |
82 |
} |
| 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; |
|
72 |
+ 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,19 +92,13 @@ |
| 92 |
92 |
} |
| 93 |
93 |
fetchFilterSearch() { |
| 94 |
94 |
return new Promise((resolve) => { |
| 95 |
|
- if(this.hasActiveFilters()) { |
| 96 |
|
- fetch(this.filterUrl).then(res => res.json()).then(resolve); |
|
80 |
+ if(hasActiveFilters) { |
|
81 |
+ fetch(this.filterUrl).then(console.log); |
| 97 |
97 |
} else { |
| 98 |
98 |
resolve(null); |
| 99 |
99 |
} |
| 100 |
100 |
}); |
| 101 |
101 |
} |
| 102 |
|
- filterResults = (filteredCollabs) => { |
| 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 |
|
- } |
| 108 |
108 |
getLink(xwikiDocSpace) { |
| 109 |
109 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 110 |
110 |
} |