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,31 +34,61 @@
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('', applyAdministratorFilter)
41	41	}
42	42
43	43	});
44		- });
45		-*/
46		-require(['jquery'], function($) {
47		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
48		- const contextSearchButton = document.getElementById("context-search-button");
49		- contextSearchButton.addEventListener('click', function() {
50		- $.post(solrServiceURL, {
51		- outputSyntax: 'plain',
52		- media: 'json',
53		- query: [
54		- 'q=*__INPUT__*',
55		- 'fq=type:DOCUMENT',
56		- 'fq=class:XWiki.XWikiUsers',
57		- 'qf=property.XWiki.XWikiUsers.last_name^10 property.XWiki.XWikiUsers.first_name^5 name^2.5'
58		- ].join('\n'),
59		- input: $('#context-search-text').val()
	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	+ });
60	60	});
61		- });
	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 => {
	67	+ const r = spaces.some(space => {
	68	+ console.log(result.space, space);
	69	+ return result.space.startsWith(space)
	70	+ })
	71	+
	72	+ return r
	73	+ });
	74	+ resolve(filtered);
	75	+ })
	76	+
	77	+ })
	78	+ }
62	62	});
	80	+
	81	+
63	63	</script>
64	64	{{/html}}