Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -5,22 +5,15 @@
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>
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	24	window.addEventListener('DOMContentLoaded', function() {
25	25	const contextSearchType = document.getElementById("context-search-type");
26	26	const contextSearchText = document.getElementById("context-search-text");
...	...	@@ -34,35 +34,55 @@
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);
	30	+ handleXWikiSearch('bougaultx');
38	38	break
39	39	default:
40		- fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
	33	+ handleXWikiSearch('', applyAdministratorFilter)
41	41	}
42	42
43	43	});
44		- });
45		-*/
46		- console.log('hello world');
47		-const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
48		-console.log('xxxxx', solrServiceURL);
49		-
50		-require(['jquery'], function($) {
51		- console.log('ZZZZ');
52		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
53		- const contextSearchButton = document.getElementById("context-search-button");
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.the-collaboratory'
62		- ].join('\n'),
63		- input: $('#context-search-text').val()
	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	+ });
64	64	});
65		- });
	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	+ })
	74	+
	75	+ })
	76	+ }
66	66	});
	78	+
	79	+
67	67	</script>
68	68	{{/html}}