Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -5,6 +5,10 @@
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" data-role-filter="administrator"> 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,6 +11,38 @@
11	11	<pre id="context-search-response"></pre>
12	12	<script>
13	13	window.addEventListener('DOMContentLoaded', function() {
	18	+ const filters = {
	19	+ search: '',
	20	+ offset: 0,
	21	+ orderField: 'title',
	22	+ order: 'asc',
	23	+ favorite: false,
	24	+ roles: [] // to be joined as administrator+editor+viewer
	25	+ };
	26	+
	27	+ function addRole(role) {
	28	+ if(filters.roles.indexOf(role) == -1) {
	29	+ filters.roles.push(role);
	30	+ }
	31	+ }
	32	+
	33	+ function removeRole(role) {
	34	+ filters.roles.filter(r => r !== 'administrator')
	35	+ }
	36	+
	37	+ document.querySelector('checkbox[data-role-filter]').forEach(function(filter) {
	38	+ filter.addEventListener('click', function() {
	39	+ const role = this.getAttribute('data-role-filter');
	40	+ if(this.checked) {
	41	+ addRole(role);
	42	+ } else {
	43	+ removeRole(role);
	44	+ }
	45	+ console.log(filters);
	46	+ })
	47	+ });
	48	+
	49	+ // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
14	14	const contextSearchType = document.getElementById("context-search-type");
15	15	const contextSearchText = document.getElementById("context-search-text");
16	16	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -18,7 +18,6 @@
18	18	contextSearchButton.addEventListener('click', function() {
19	19	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
20	20	const term = contextSearchText.value;
21		- searchWithAdministratorFilter(term);
22	22	switch(context) {
23	23	case 'collabs':
24	24	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -27,11 +27,11 @@
27	27	handleXWikiSearch('bougaultx');
28	28	break
29	29	default:
30		- handleXWikiSearch()
	65	+ handleXWikiSearch('', applyAdministratorFilter)
31	31	}
32	32
33	33	});
34		- function handleXWikiSearch(space) {
	69	+ function handleXWikiSearch(space, callback) {
35	35	require(['jquery'], function($) {
36	36	var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
37	37	const contextSearchButton = document.getElementById("context-search-button");
...	...	@@ -47,29 +47,29 @@
47	47	].join('\n'),
48	48	input: $('#context-search-text').val()
49	49	}).then(res => {
50		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	85	+ if(callback) {
	86	+ callback(res).then(results => {
	87	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	88	+ })
	89	+ } else {
	90	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	91	+ }
51	51	});
52	52	});
53	53	});
54	54	}
55		- function searchWithAdministratorFilter(term) {
56		- let xwikiSpace = "";
57		- // parameters are set according to ticked filter. Hardcoded for POC
58		- Promise.all([
59		- fetch("/rest/v1/collabs?roles=administrator").then(res => res.json()),
60		- fetch("/bin/get/XWiki/SuggestSolrService", {
61		- method: "POST",
62		- body: {
63		- outputSyntax: 'plain',
64		- media: 'json',
65		- query: [
66		- 'q="__INPUT__"~100',
67		- 'fq=type:DOCUMENT',
68		- `fq=space:Collabs${xwikiSpace}.*`
69		- ].join('\n'),
70		- input: term
71		- }})
72		- ]).then(res => console.log("Search with administrator", res))
	96	+ function applyAdministratorFilter(results) {
	97	+ return new Promise((resolve, reject) => {
	98	+ //fetch("/rest/v1/collabs?roles=administrator")
	99	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	100	+ .then(res => res.json())
	101	+ .then(collabs => {
	102	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	103	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	104	+ resolve(filtered);
	105	+ })
	106	+
	107	+ })
73	73	}
74	74	});
75	75