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,38 +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		- 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
50	50	const contextSearchType = document.getElementById("context-search-type");
51	51	const contextSearchText = document.getElementById("context-search-text");
52	52	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -54,6 +54,7 @@
54	54	contextSearchButton.addEventListener('click', function() {
55	55	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
56	56	const term = contextSearchText.value;
	21	+ searchWithAdministratorFilter(term);
57	57	switch(context) {
58	58	case 'collabs':
59	59	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -62,11 +62,11 @@
62	62	handleXWikiSearch('bougaultx');
63	63	break
64	64	default:
65		- handleXWikiSearch('', applyAdministratorFilter)
	30	+ handleXWikiSearch()
66	66	}
67	67
68	68	});
69		- function handleXWikiSearch(space, callback) {
	34	+ function handleXWikiSearch(space) {
70	70	require(['jquery'], function($) {
71	71	var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
72	72	const contextSearchButton = document.getElementById("context-search-button");
...	...	@@ -82,29 +82,14 @@
82	82	].join('\n'),
83	83	input: $('#context-search-text').val()
84	84	}).then(res => {
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		- }
	50	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
92	92	});
93	93	});
94	94	});
95	95	}
96	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		- })
	56	+ console.log(results);
	57	+ fetch("/rest/v1/collabs?roles=administrator").then(res => res.json()).then(collabs => collabs.name).then(console.log)
108	108	}
109	109	});
110	110