Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -5,15 +5,23 @@
5	5	<option value="collabs">Collabs</option>
6	6	<option value="current-collab">Current Collab</option>
7	7	</select>
8		-<div>
9		-<label>
10		- <input type="checkbox" id="administratorFilter"> Administrator
11		-</label>
12	12	<input type="text" id="context-search-text" />
13	13	<button id="context-search-button" class="btn btn-primary">Search</button>
14	14
15	15	<pre id="context-search-response"></pre>
16	16	<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	+ */
17	17	window.addEventListener('DOMContentLoaded', function() {
18	18	const contextSearchType = document.getElementById("context-search-type");
19	19	const contextSearchText = document.getElementById("context-search-text");
...	...	@@ -27,55 +27,35 @@
27	27	document.location.href = `/bin/view/Collabs/#search=${term}`;
28	28	break;
29	29	case 'current-collab':
30		- handleXWikiSearch('bougaultx');
	38	+ fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
	39	+ //handleXWikiSearch('bougaultx');
31	31	break
32	32	default:
33		- handleXWikiSearch('', applyAdministratorFilter)
	42	+ handleXWikiSearch()
	43	+ //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
34	34	}
35	35
36	36	});
37		- function handleXWikiSearch(space, callback) {
38		- require(['jquery'], function($) {
39		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
40		- const contextSearchButton = document.getElementById("context-search-button");
41		- const xwikiSpace = space ? `.${space}` : '';
42		- contextSearchButton.addEventListener('click', function() {
43		- $.post(solrServiceURL, {
44		- outputSyntax: 'plain',
45		- media: 'json',
46		- query: [
47		- 'q="__INPUT__"~100',
48		- 'fq=type:DOCUMENT',
49		- `fq=space:Collabs${xwikiSpace}.*`
50		- ].join('\n'),
51		- input: $('#context-search-text').val()
52		- }).then(res => {
53		- if(callback) {
54		- callback(res).then(results => {
55		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
56		- })
57		- } else {
58		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
59		- }
60		- });
61		- });
62		- });
63		- }
64		- function applyAdministratorFilter(results) {
65		- return new Promise((resolve, reject) => {
66		- //fetch("/rest/v1/collabs?roles=administrator")
67		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
68		- .then(res => res.json())
69		- .then(collabs => {
70		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
71		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
72		- resolve(filtered);
73		- })
	47	+ });
74	74
75		- })
76		- }
77		-});
78		-
79		-
	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	+ });
	65	+ });
	66	+ });
	67	+}
80	80	</script>
81	81	{{/html}}