Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -10,17 +10,6 @@
10	10
11	11	<pre id="context-search-response"></pre>
12	12	<script>
13		- /*
14		- async function fetchGlobalSearch(term) {
15		- const res = await fetch(`/rest/wikis/query?q=${term}&media=json`)
16		- const json = await res.json();
17		- return JSON.stringify(json, null, 2);
18		- }
19		- async function fetchCurrentCollabSearch(term) {
20		- const res = await fetch(`/rest/wikis/xwiki/spaces/Collabs/spaces/bougaultx/search?q=${term}&media=json`)
21		- const json = await res.json();
22		- return JSON.stringify(json, null, 2);
23		- }
24	24	window.addEventListener('DOMContentLoaded', function() {
25	25	const contextSearchType = document.getElementById("context-search-type");
26	26	const contextSearchText = document.getElementById("context-search-text");
...	...	@@ -34,35 +34,34 @@
34	34	document.location.href = `/bin/view/Collabs/#search=${term}`;
35	35	break;
36	36	case 'current-collab':
37		- fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
	26	+ handleXWikiSearch('bougaultx');
38	38	break
39	39	default:
40		- fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
	29	+ handleXWikiSearch()
41	41	}
42	42
43	43	});
44	44	});
45		-*/
46		- console.log('hello world');
47		-const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
48		-console.log('xxxxx', solrServiceURL);
49	49
50		-require(['jquery'], function($) {
51		- console.log('ZZZZ');
52		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
53		- const contextSearchButton = document.getElementById("context-search-button");
54		- contextSearchButton.addEventListener('click', function() {
	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() {
55	55	$.post(solrServiceURL, {
56		- outputSyntax: 'plain',
57		- media: 'json',
58		- query: [
59		- 'q=*__INPUT__*',
60		- 'fq=type:DOCUMENT',
61		- 'fq=space:Collabs.bougaultx.*'
62		- ].join('\n'),
63		- input: $('#context-search-text').val()
	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 => console.log('zzz', res));
	51	+
64	64	});
65	65	});
66		-});
	54	+}
67	67	</script>
68	68	{{/html}}