Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -26,56 +26,34 @@
26	26	handleXWikiSearch('bougaultx');
27	27	break
28	28	default:
29		- handleXWikiSearch('', applyAdministratorFilter)
	29	+ handleXWikiSearch()
30	30	}
31	31
32	32	});
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		- });
	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__*',
	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);
58	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 => {
65		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
66		- const filtered = results.filter(result => {
67		- return spaces.some(space => {
68		- console.log(result.space, space);
69		- return result.space.startsWith(space)
70		- })
71		- });
72		- console.log(filtered, spaces, results);
73		- resolve(results);
74		- })
75	75
76		- })
77		- }
78		-});
	53	+ });
	54	+ });
	55	+}
	56	+ });
79	79
80	80
81	81	</script>