Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -5,6 +5,10 @@
5	5	<option value="collabs">Collabs</option>
6	6	<option value="current-collab">Current Collab</option>
7	7	</select>
	8	+<div>
	9	+<label>
	10	+ <input type="checkbox" id="administratorFilter"> Administrator
	11	+</label>
8	8	<input type="text" id="context-search-text" />
9	9	<button id="context-search-button" class="btn btn-primary">Search</button>
10	10
...	...	@@ -18,7 +18,6 @@
18	18	contextSearchButton.addEventListener('click', function() {
19	19	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
20	20	const term = contextSearchText.value;
21		- searchWithAdministratorFilter(term);
22	22	switch(context) {
23	23	case 'collabs':
24	24	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -27,11 +27,11 @@
27	27	handleXWikiSearch('bougaultx');
28	28	break
29	29	default:
30		- handleXWikiSearch()
	33	+ handleXWikiSearch('', applyAdministratorFilter)
31	31	}
32	32
33	33	});
34		- function handleXWikiSearch(space) {
	37	+ function handleXWikiSearch(space, callback) {
35	35	require(['jquery'], function($) {
36	36	var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
37	37	const contextSearchButton = document.getElementById("context-search-button");
...	...	@@ -47,14 +47,29 @@
47	47	].join('\n'),
48	48	input: $('#context-search-text').val()
49	49	}).then(res => {
50		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	53	+ if(callback) {
	54	+ callback(res).then(results => {
	55	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	56	+ })
	57	+ } else {
	58	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	59	+ }
51	51	});
52	52	});
53	53	});
54	54	}
55	55	function applyAdministratorFilter(results) {
56		- console.log(results);
57		- fetch("/rest/v1/collabs?roles=administrator").then(res => res.json()).then(collabs => collabs.name).then(console.log)
	65	+ return new Promise((resolve, reject) => {
	66	+ //fetch("/rest/v1/collabs?roles=administrator")
	67	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	68	+ .then(res => res.json())
	69	+ .then(collabs => {
	70	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	71	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	72	+ resolve(filtered);
	73	+ })
	74	+
	75	+ })
58	58	}
59	59	});
60	60