Changes for page Context Search

Summary

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

Details

Page properties

Content

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