Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -10,16 +10,6 @@
10	10
11	11	<pre id="context-search-response"></pre>
12	12	<script>
13		- async function fetchGlobalSearch(term) {
14		- const res = await fetch(`/rest/wikis/query?q=${term}&media=json`)
15		- const json = await res.json();
16		- return JSON.stringify(json, null, 2);
17		- }
18		- async function fetchCurrentCollabSearch(term/*, collabName*/) {
19		- const res = await fetch(`/rest/wikis/xwiki/spaces/Collabs/spaces/bougaultx/search?q=${term}&media=json`)
20		- const json = await res.json();
21		- return JSON.stringify(json, null, 2);
22		- }
23	23	window.addEventListener('DOMContentLoaded', function() {
24	24	const contextSearchType = document.getElementById("context-search-type");
25	25	const contextSearchText = document.getElementById("context-search-text");
...	...	@@ -33,13 +33,54 @@
33	33	document.location.href = `/bin/view/Collabs/#search=${term}`;
34	34	break;
35	35	case 'current-collab':
36		- fetchCurrentCollabSearch(term/*, collabName*/).then(results => contextSearchResponse.innerText = results);
	26	+ handleXWikiSearch('bougaultx');
37	37	break
38	38	default:
39		- fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
	29	+ handleXWikiSearch('', applyAdministratorFilter)
40	40	}
41	41
42	42	});
43		- });
	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 => collabs.name)
	65	+ .then(names => {
	66	+ console.log(names, results);
	67	+ resolve(results);
	68	+ })
	69	+
	70	+ })
	71	+ }
	72	+});
	73	+
	74	+
44	44	</script>
45	45	{{/html}}