Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -10,6 +10,18 @@
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	+ */
13	13	window.addEventListener('DOMContentLoaded', function() {
14	14	const contextSearchType = document.getElementById("context-search-type");
15	15	const contextSearchText = document.getElementById("context-search-text");
...	...	@@ -18,61 +18,41 @@
18	18	contextSearchButton.addEventListener('click', function() {
19	19	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
20	20	const term = contextSearchText.value;
21		- searchWithAdministratorFilter(term);
22	22	switch(context) {
23	23	case 'collabs':
24	24	document.location.href = `/bin/view/Collabs/#search=${term}`;
25	25	break;
26	26	case 'current-collab':
27		- handleXWikiSearch('bougaultx');
	38	+ fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
	39	+ //handleXWikiSearch('bougaultx');
28	28	break
29	29	default:
30	30	handleXWikiSearch()
	43	+ //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
31	31	}
32	32
33	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__"~100',
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);
51		- });
52		- });
53		- });
54		- }
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"),
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		- }})
72		- ).then(res => console.log("Search with administrator", res))
73		- }
74		-});
	47	+ });
75	75
76		-
	49	+function handleXWikiSearch(space) {
	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	+ const xwikiSpace = space ? `.${xwikiSpace}` : '';
	55	+ contextSearchButton.addEventListener('click', function() {
	56	+ $.post(solrServiceURL, {
	57	+ outputSyntax: 'plain',
	58	+ media: 'json',
	59	+ query: [
	60	+ 'q=*__INPUT__*',
	61	+ 'fq=type:DOCUMENT',
	62	+ `fq=space:Collabs${xWikiSpace}.*`
	63	+ ].join('\n'),
	64	+ input: $('#context-search-text').val()
	65	+ });
	66	+ });
	67	+ });
	68	+}
77	77	</script>
78	78	{{/html}}