Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -26,52 +26,31 @@
26	26	handleXWikiSearch('bougaultx');
27	27	break
28	28	default:
29		- handleXWikiSearch('', applyAdministratorFilter)
	29	+ handleXWikiSearch()
30	30	}
31	31
32	32	});
33		- function handleXWikiSearch(space, callback) {
34		- require(['jquery'], function($) {
35		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
36		- const contextSearchButton = document.getElementById("context-search-button");
37		- const xwikiSpace = space ? `.${space}` : '';
38		- contextSearchButton.addEventListener('click', function() {
39		- $.post(solrServiceURL, {
40		- outputSyntax: 'plain',
41		- media: 'json',
42		- query: [
43		- 'q="__INPUT__"~100',
44		- 'fq=type:DOCUMENT',
45		- `fq=space:Collabs${xwikiSpace}.*`
46		- ].join('\n'),
47		- input: $('#context-search-text').val()
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		- }
56		- });
57		- });
58		- });
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 => spaces.includes(result.space));
67		- console.log(filtered, spaces, results);
68		- resolve(results);
69		- })
	33	+ });
70	70
71		- })
72		- }
73		-});
74		-
75		-
	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	+ const res = $.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	+ });
	51	+ console.log(res);
	52	+ });
	53	+ });
	54	+}
76	76	</script>
77	77	{{/html}}