Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -18,6 +18,7 @@
18	18	contextSearchButton.addEventListener('click', function() {
19	19	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
20	20	const term = contextSearchText.value;
	21	+ searchWithAdministratorFilter(term);
21	21	switch(context) {
22	22	case 'collabs':
23	23	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -26,11 +26,11 @@
26	26	handleXWikiSearch('bougaultx');
27	27	break
28	28	default:
29		- handleXWikiSearch('', applyAdministratorFilter)
	30	+ handleXWikiSearch()
30	30	}
31	31
32	32	});
33		- function handleXWikiSearch(space, callback) {
	34	+ 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,35 +46,29 @@
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		- }
	50	+ 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 => {
65		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
66		- const filtered = results.filter(result => {
67		- const r = spaces.some(space => {
68		- console.log(result.space, space);
69		- return result.space.startsWith(space)
70		- })
71		- console.log(r, result.space);
72		- return r
73		- });
74		- resolve(filtered);
75		- })
76		-
77		- })
	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	+ }}).then(res => res.text())
	72	+ ]).then(([collabs, results]) => console.log(collabs, results))
78	78	}
79	79	});
80	80