| ... |
... |
@@ -26,11 +26,11 @@ |
| 26 |
26 |
handleXWikiSearch('bougaultx'); |
| 27 |
27 |
break |
| 28 |
28 |
default: |
| 29 |
|
- handleXWikiSearch('', applyAdministratorFilter) |
|
29 |
+ handleXWikiSearch() |
| 30 |
30 |
} |
| 31 |
31 |
|
| 32 |
32 |
}); |
| 33 |
|
- function handleXWikiSearch(space, callback) { |
|
33 |
+ function handleXWikiSearch(space) { |
| 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,29 +46,16 @@ |
| 46 |
46 |
].join('\n'), |
| 47 |
47 |
input: $('#context-search-text').val() |
| 48 |
48 |
}).then(res => { |
| 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 |
|
- } |
|
49 |
+ contextSearchResponse.innerText = JSON.stringify(res, null, 2); |
| 56 |
56 |
}); |
| 57 |
57 |
}); |
| 58 |
58 |
}); |
| 59 |
59 |
} |
| 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 => collabs.name) |
| 65 |
|
- .then(names => { |
| 66 |
|
- console.log(names, results); |
| 67 |
|
- resolve(results); |
| 68 |
|
- }) |
| 69 |
|
- |
| 70 |
|
- }) |
|
54 |
+ function getCurrentUserCollabs() { |
|
55 |
+ fetch("/rest/v1/identity/users/me").then(console.log); |
| 71 |
71 |
} |
|
57 |
+ |
|
58 |
+ getCurrentUserCollabs(); |
| 72 |
72 |
}); |
| 73 |
73 |
|
| 74 |
74 |
|