Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -10,18 +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		- */
25	25	window.addEventListener('DOMContentLoaded', function() {
26	26	const contextSearchType = document.getElementById("context-search-type");
27	27	const contextSearchText = document.getElementById("context-search-text");
...	...	@@ -30,40 +30,61 @@
30	30	contextSearchButton.addEventListener('click', function() {
31	31	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
32	32	const term = contextSearchText.value;
	21	+ searchWithAdministratorFilter(term);
33	33	switch(context) {
34	34	case 'collabs':
35	35	document.location.href = `/bin/view/Collabs/#search=${term}`;
36	36	break;
37	37	case 'current-collab':
38		- fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
39		- //handleXWikiSearch('bougaultx');
	27	+ handleXWikiSearch('bougaultx');
40	40	break
41	41	default:
42	42	handleXWikiSearch()
43		- //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
44	44	}
45	45
46	46	});
47		- });
48		-
49		-function handleXWikiSearch(space) {
50		- require(['jquery'], function($) {
51		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
52		- const contextSearchButton = document.getElementById("context-search-button");
53		- const xwikiSpace = space ? `.${space}` : '';
54		- contextSearchButton.addEventListener('click', function() {
55		- $.post(solrServiceURL, {
56		- outputSyntax: 'plain',
57		- media: 'json',
58		- query: [
59		- 'q=*__INPUT__*',
60		- 'fq=type:DOCUMENT',
61		- `fq=space:Collabs${xwikiSpace}.*`
62		- ].join('\n'),
63		- input: $('#context-search-text').val()
64		- });
	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	+ });
65	65	});
66		- });
67		-}
	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").then(res => res.json()),
	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	+});
	75	+
	76	+
68	68	</script>
69	69	{{/html}}