Changes for page Context Search

Summary

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

Details

Page properties

Content

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