Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -5,10 +5,6 @@
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>
12	12	<input type="text" id="context-search-text" />
13	13	<button id="context-search-button" class="btn btn-primary">Search</button>
14	14
...	...	@@ -22,6 +22,7 @@
22	22	contextSearchButton.addEventListener('click', function() {
23	23	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
24	24	const term = contextSearchText.value;
	21	+ searchWithAdministratorFilter(term);
25	25	switch(context) {
26	26	case 'collabs':
27	27	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -30,11 +30,11 @@
30	30	handleXWikiSearch('bougaultx');
31	31	break
32	32	default:
33		- handleXWikiSearch('', applyAdministratorFilter)
	30	+ handleXWikiSearch()
34	34	}
35	35
36	36	});
37		- function handleXWikiSearch(space, callback) {
	34	+ function handleXWikiSearch(space) {
38	38	require(['jquery'], function($) {
39	39	var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
40	40	const contextSearchButton = document.getElementById("context-search-button");
...	...	@@ -50,29 +50,29 @@
50	50	].join('\n'),
51	51	input: $('#context-search-text').val()
52	52	}).then(res => {
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		- }
	50	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
60	60	});
61	61	});
62	62	});
63	63	}
64		- function applyAdministratorFilter(results) {
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		- })
	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))
76	76	}
77	77	});
78	78