Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -5,24 +5,52 @@
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" data-role-filter="administrator"> 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() {
	19	+ const filters = {
	20	+ search: '',
	21	+ offset: 0,
	22	+ orderField: 'title',
	23	+ order: 'asc',
	24	+ favorite: false,
	25	+ roles: [] // to be joined as administrator+editor+viewer
	26	+ };
	27	+
	28	+ function addRole(role) {
	29	+ if(filters.roles.indexOf(role) == -1) {
	30	+ filters.roles.push(role);
	31	+ }
	32	+ }
	33	+
	34	+ function removeRole(role) {
	35	+ filters.roles.filter(r => r !== 'administrator')
	36	+ }
	37	+
	38	+ const filterInputs = document.querySelectorAll('input[data-role-filter]');
	39	+ console.log(filterInputs);
	40	+ filterInputs.forEach(function(filterIpt) {
	41	+ console.log(filterIpt);
	42	+ filterIpt.addEventListener('click', function() {
	43	+ const role = this.getAttribute('data-role-filter');
	44	+ if(this.checked) {
	45	+ addRole(role);
	46	+ } else {
	47	+ removeRole(role);
	48	+ }
	49	+ console.log(filters);
	50	+ })
	51	+ });
	52	+
	53	+ // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
26	26	const contextSearchType = document.getElementById("context-search-type");
27	27	const contextSearchText = document.getElementById("context-search-text");
28	28	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -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');
	66	+ handleXWikiSearch('bougaultx');
40	40	break
41	41	default:
42		- handleXWikiSearch()
43		- //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
	69	+ 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		- });
	73	+ function handleXWikiSearch(space, callback) {
	74	+ require(['jquery'], function($) {
	75	+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	76	+ const contextSearchButton = document.getElementById("context-search-button");
	77	+ const xwikiSpace = space ? `.${space}` : '';
	78	+ contextSearchButton.addEventListener('click', function() {
	79	+ $.post(solrServiceURL, {
	80	+ outputSyntax: 'plain',
	81	+ media: 'json',
	82	+ query: [
	83	+ 'q="__INPUT__"~100',
	84	+ 'fq=type:DOCUMENT',
	85	+ `fq=space:Collabs${xwikiSpace}.*`
	86	+ ].join('\n'),
	87	+ input: $('#context-search-text').val()
	88	+ }).then(res => {
	89	+ if(callback) {
	90	+ callback(res).then(results => {
	91	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	92	+ })
	93	+ } else {
	94	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	95	+ }
	96	+ });
	97	+ });
65	65	});
66		- });
67		-}
	99	+ }
	100	+ function applyAdministratorFilter(results) {
	101	+ return new Promise((resolve, reject) => {
	102	+ //fetch("/rest/v1/collabs?roles=administrator")
	103	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	104	+ .then(res => res.json())
	105	+ .then(collabs => {
	106	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	107	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	108	+ resolve(filtered);
	109	+ })
	110	+
	111	+ })
	112	+ }
	113	+});
	114	+
	115	+
68	68	</script>
69	69	{{/html}}