Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -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()
	29	+ handleXWikiSearch('', applyAdministratorFilter)
31	31	}
32	32
33	33	});
34		- function handleXWikiSearch(space) {
	33	+ 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,29 +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);
	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	+ }
51	51	});
52	52	});
53	53	});
54	54	}
55		- function searchWithAdministratorFilter(term) {
56		- let xwikiSpace = "";
57		- // parameters are set according to ticked filter. Hardcoded for POC
58		- Promise.all([
59		- fetch("/rest/v1/collabs?roles=administrator").then(res => res.json()),
60		- fetch("/bin/get/XWiki/SuggestSolrService", {
61		- method: "POST",
62		- body: {
63		- outputSyntax: 'plain',
64		- media: 'json',
65		- query: [
66		- 'q="__INPUT__"~100',
67		- 'fq=type:DOCUMENT',
68		- `fq=space:Collabs${xwikiSpace}.*`
69		- ].join('\n'),
70		- input: term
71		- }})
72		- ]).then(res => console.log("Search with administrator", res))
	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 => spaces.includes(result.space));
	67	+ console.log(filtered, spaces, results);
	68	+ resolve(results);
	69	+ })
	70	+
	71	+ })
73	73	}
74	74	});
75	75