Changes for page Context Search

Summary

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

Details

Page properties

Content

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