Changes for page Context Search

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -5,6 +5,11 @@
5	5	<option value="collabs">Collabs</option>
6	6	<option value="current-collab">Current Collab</option>
7	7	</select>
	8	+<div class="form-group">
	9	+ <label>
	10	+ <input type="checkbox" id="administratorFilter"> Administrator
	11	+ </label>
	12	+</div>
8	8	<input type="text" id="context-search-text" />
9	9	<button id="context-search-button" class="btn btn-primary">Search</button>
10	10
...	...	@@ -26,11 +26,11 @@
26	26	handleXWikiSearch('bougaultx');
27	27	break
28	28	default:
29		- handleXWikiSearch()
	34	+ handleXWikiSearch('', applyAdministratorFilter)
30	30	}
31	31
32	32	});
33		- function handleXWikiSearch(space) {
	38	+ 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,16 +46,30 @@
46	46	].join('\n'),
47	47	input: $('#context-search-text').val()
48	48	}).then(res => {
49		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	54	+ if(callback) {
	55	+ callback(res).then(results => {
	56	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	57	+ })
	58	+ } else {
	59	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	60	+ }
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))
	65	+ function applyAdministratorFilter(results) {
	66	+ return new Promise((resolve, reject) => {
	67	+ //fetch("/rest/v1/collabs?roles=administrator")
	68	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	69	+ .then(res => res.json())
	70	+ .then(collabs => {
	71	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	72	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	73	+ resolve(filtered);
	74	+ })
	75	+
	76	+ })
56	56	}
57		-
58		- getCurrentUserCollabs();
59	59	});
60	60
61	61