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
...	...	@@ -31,52 +31,33 @@
31	31	handleXWikiSearch('bougaultx');
32	32	break
33	33	default:
34		- handleXWikiSearch('', applyAdministratorFilter)
	29	+ handleXWikiSearch()
35	35	}
36	36
37	37	});
38		- function handleXWikiSearch(space, callback) {
39		- require(['jquery'], function($) {
40		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
41		- const contextSearchButton = document.getElementById("context-search-button");
42		- const xwikiSpace = space ? `.${space}` : '';
43		- contextSearchButton.addEventListener('click', function() {
44		- $.post(solrServiceURL, {
45		- outputSyntax: 'plain',
46		- media: 'json',
47		- query: [
48		- 'q="__INPUT__"~100',
49		- 'fq=type:DOCUMENT',
50		- `fq=space:Collabs${xwikiSpace}.*`
51		- ].join('\n'),
52		- input: $('#context-search-text').val()
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		- }
61		- });
62		- });
	33	+ });
	34	+
	35	+function handleXWikiSearch(space) {
	36	+ require(['jquery'], function($) {
	37	+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	38	+ const contextSearchButton = document.getElementById("context-search-button");
	39	+ const xwikiSpace = space ? `.${space}` : '';
	40	+ contextSearchButton.addEventListener('click', function() {
	41	+ $.post(solrServiceURL, {
	42	+ outputSyntax: 'plain',
	43	+ media: 'json',
	44	+ query: [
	45	+ 'q=*__INPUT__*',
	46	+ 'fq=type:DOCUMENT',
	47	+ `fq=space:Collabs${xwikiSpace}.*`
	48	+ ].join('\n'),
	49	+ input: $('#context-search-text').val()
	50	+ }).then(res => {
	51	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
63	63	});
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	75
76		- })
77		- }
78		-});
79		-
80		-
	54	+ });
	55	+ });
	56	+}
81	81	</script>
82	82	{{/html}}