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