| ... |
... |
@@ -26,11 +26,11 @@ |
| 26 |
26 |
handleXWikiSearch('bougaultx'); |
| 27 |
27 |
break |
| 28 |
28 |
default: |
| 29 |
|
- handleXWikiSearch() |
|
29 |
+ handleXWikiSearch('', applyAdministratorFilter) |
| 30 |
30 |
} |
| 31 |
31 |
|
| 32 |
32 |
}); |
| 33 |
|
- function handleXWikiSearch(space) { |
|
33 |
+ function handleXWikiSearch(space, callback) { |
| 34 |
34 |
require(['jquery'], function($) { |
| 35 |
35 |
var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
| 36 |
36 |
const contextSearchButton = document.getElementById("context-search-button"); |
| ... |
... |
@@ -46,13 +46,34 @@ |
| 46 |
46 |
].join('\n'), |
| 47 |
47 |
input: $('#context-search-text').val() |
| 48 |
48 |
}).then(res => { |
| 49 |
|
- contextSearchResponse.innerText = JSON.stringify(res, null, 2); |
|
49 |
+ if(callback) { |
|
50 |
+ callback(res).then(results => { |
|
51 |
+ contextSearchResponse.innerText = JSON.stringify(results, null, 2); |
|
52 |
+ }) |
|
53 |
+ } else { |
|
54 |
+ contextSearchResponse.innerText = JSON.stringify(res, null, 2); |
|
55 |
+ } |
| 50 |
50 |
}); |
| 51 |
51 |
}); |
| 52 |
52 |
}); |
| 53 |
53 |
} |
| 54 |
|
- function getCurrentUserCollabs() { |
| 55 |
|
- fetch("/rest/v1/identity/users/me").then(user => user.username).then(username => console.log(username)) |
|
60 |
+ function applyAdministratorFilter(results) { |
|
61 |
+ return new Promise((resolve, reject) => { |
|
62 |
+ fetch("/rest/v1/collabs?roles=administrator") |
|
63 |
+ .then(res => res.json()) |
|
64 |
+ .then(collabs => { |
|
65 |
+ const spaces = collabs.map(collab => `Collabs.${collab.name}`); |
|
66 |
+ const filtered = results.filter(result => { |
|
67 |
+ return spaces.some(space => { |
|
68 |
+ console.log(result.space, space); |
|
69 |
+ return result.space.startsWith(space) |
|
70 |
+ }) |
|
71 |
+ }); |
|
72 |
+ console.log(filtered, spaces, results); |
|
73 |
+ resolve(results); |
|
74 |
+ }) |
|
75 |
+ |
|
76 |
+ }) |
| 56 |
56 |
} |
| 57 |
57 |
}); |
| 58 |
58 |
|