Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -7,62 +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		- runFilteredRequest();
53		- })
54		- });
55		-
56		- function runFilteredRequest() {
57		- const urlParams = new URLSearchParams();
58		- const tmpFilters = filters;
59		- tmpFilters.roles = tmpFilters.roles.join("+");
60		- for(filter in tmpFilters) {
61		- urlParams.set(filter, tmpFilters[filter]);
62		- }
63		- console.log(urlParams);
64		- }
65		- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
66	66	const contextSearchType = document.getElementById("context-search-type");
67	67	const contextSearchText = document.getElementById("context-search-text");
68	68	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -70,6 +70,7 @@
70	70	contextSearchButton.addEventListener('click', function() {
71	71	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
72	72	const term = contextSearchText.value;
	21	+ searchWithAdministratorFilter(term);
73	73	switch(context) {
74	74	case 'collabs':
75	75	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -78,11 +78,11 @@
78	78	handleXWikiSearch('bougaultx');
79	79	break
80	80	default:
81		- handleXWikiSearch('')
	30	+ handleXWikiSearch()
82	82	}
83	83
84	84	});
85		- function handleXWikiSearch(space, callback) {
	34	+ function handleXWikiSearch(space) {
86	86	require(['jquery'], function($) {
87	87	var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
88	88	const contextSearchButton = document.getElementById("context-search-button");
...	...	@@ -98,29 +98,29 @@
98	98	].join('\n'),
99	99	input: $('#context-search-text').val()
100	100	}).then(res => {
101		- if(callback) {
102		- callback(res).then(results => {
103		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
104		- })
105		- } else {
106		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
107		- }
	50	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
108	108	});
109	109	});
110	110	});
111	111	}
112		- function applyAdministratorFilter(results) {
113		- return new Promise((resolve, reject) => {
114		- //fetch("/rest/v1/collabs?roles=administrator")
115		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
116		- .then(res => res.json())
117		- .then(collabs => {
118		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
119		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
120		- resolve(filtered);
121		- })
122		-
123		- })
	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(([collabs, results]) => console.log(collabs, results))
124	124	}
125	125	});
126	126