Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -7,52 +7,10 @@
7	7	</select>
8	8	<input type="text" id="context-search-text" />
9	9	<button id="context-search-button" class="btn btn-primary">Search</button>
10		-<div class="form-group">
11		- <label>
12		- <input type="checkbox" data-role-filter="administrator"> Administrator
13		- </label>
14		- <label>
15		- <input type="checkbox" data-role-filter="editor"> Editor
16		- </label>
17		-</div>
18	18
19		-
20	20	<pre id="context-search-response"></pre>
21	21	<script>
22	22	window.addEventListener('DOMContentLoaded', function() {
23		- const filters = {
24		- search: '',
25		- offset: 0,
26		- orderField: 'title',
27		- order: 'asc',
28		- favorite: false,
29		- roles: [] // to be joined as administrator+editor+viewer
30		- };
31		-
32		- function addRole(role) {
33		- if(filters.roles.indexOf(role) == -1) {
34		- filters.roles.push(role);
35		- }
36		- }
37		-
38		- function removeRole(role) {
39		- filters.roles = filters.roles.filter(r => r !== role)
40		- }
41		-
42		- const filterInputs = document.querySelectorAll('input[data-role-filter]');
43		-
44		- filterInputs.forEach(function(filterIpt) {
45		- filterIpt.addEventListener('click', function() {
46		- const role = this.getAttribute('data-role-filter');
47		- if(this.checked) {
48		- addRole(role);
49		- } else {
50		- removeRole(role);
51		- }
52		- })
53		- });
54		-
55		- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
56	56	const contextSearchType = document.getElementById("context-search-type");
57	57	const contextSearchText = document.getElementById("context-search-text");
58	58	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -60,6 +60,7 @@
60	60	contextSearchButton.addEventListener('click', function() {
61	61	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
62	62	const term = contextSearchText.value;
	21	+ searchWithAdministratorFilter(term);
63	63	switch(context) {
64	64	case 'collabs':
65	65	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -68,11 +68,11 @@
68	68	handleXWikiSearch('bougaultx');
69	69	break
70	70	default:
71		- handleXWikiSearch('')
	30	+ handleXWikiSearch()
72	72	}
73	73
74	74	});
75		- function handleXWikiSearch(space, callback) {
	34	+ function handleXWikiSearch(space) {
76	76	require(['jquery'], function($) {
77	77	var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
78	78	const contextSearchButton = document.getElementById("context-search-button");
...	...	@@ -88,29 +88,29 @@
88	88	].join('\n'),
89	89	input: $('#context-search-text').val()
90	90	}).then(res => {
91		- if(callback) {
92		- callback(res).then(results => {
93		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
94		- })
95		- } else {
96		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
97		- }
	50	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
98	98	});
99	99	});
100	100	});
101	101	}
102		- function applyAdministratorFilter(results) {
103		- return new Promise((resolve, reject) => {
104		- //fetch("/rest/v1/collabs?roles=administrator")
105		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
106		- .then(res => res.json())
107		- .then(collabs => {
108		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
109		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
110		- resolve(filtered);
111		- })
112		-
113		- })
	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))
114	114	}
115	115	});
116	116