Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -5,10 +5,6 @@
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>
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,41 +15,6 @@
15	15	<pre id="context-search-response"></pre>
16	16	<script>
17	17	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		- const filterInputs = document.querySelectorAll('input[data-role-filter]');
38		- console.log(filterInputs);
39		- filterInputs.forEach(function(filterIpt) {
40		- console.log(filterIpt);
41		- filterIpt.addEventListener('click', function() {
42		- const role = this.getAttribute('data-role-filter');
43		- if(this.checked) {
44		- addRole(role);
45		- } else {
46		- removeRole(role);
47		- }
48		- console.log(filters);
49		- })
50		- });
51		-
52		- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
53	53	const contextSearchType = document.getElementById("context-search-type");
54	54	const contextSearchText = document.getElementById("context-search-text");
55	55	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -57,6 +57,7 @@
57	57	contextSearchButton.addEventListener('click', function() {
58	58	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
59	59	const term = contextSearchText.value;
	21	+ searchWithAdministratorFilter(term);
60	60	switch(context) {
61	61	case 'collabs':
62	62	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -65,11 +65,11 @@
65	65	handleXWikiSearch('bougaultx');
66	66	break
67	67	default:
68		- handleXWikiSearch('', applyAdministratorFilter)
	30	+ handleXWikiSearch()
69	69	}
70	70
71	71	});
72		- function handleXWikiSearch(space, callback) {
	34	+ function handleXWikiSearch(space) {
73	73	require(['jquery'], function($) {
74	74	var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
75	75	const contextSearchButton = document.getElementById("context-search-button");
...	...	@@ -85,29 +85,14 @@
85	85	].join('\n'),
86	86	input: $('#context-search-text').val()
87	87	}).then(res => {
88		- if(callback) {
89		- callback(res).then(results => {
90		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
91		- })
92		- } else {
93		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
94		- }
	50	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
95	95	});
96	96	});
97	97	});
98	98	}
99	99	function applyAdministratorFilter(results) {
100		- return new Promise((resolve, reject) => {
101		- //fetch("/rest/v1/collabs?roles=administrator")
102		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
103		- .then(res => res.json())
104		- .then(collabs => {
105		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
106		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
107		- resolve(filtered);
108		- })
109		-
110		- })
	56	+ console.log(results);
	57	+ fetch("/rest/v1/collabs?roles=administrator").then(res => res.json()).then(collabs => collabs.name).then(console.log)
111	111	}
112	112	});
113	113