Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -7,54 +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.filter(r => r !== 'administrator')
40		- }
41		-
42		- const filterInputs = document.querySelectorAll('input[data-role-filter]');
43		- console.log(filterInputs);
44		- filterInputs.forEach(function(filterIpt) {
45		- console.log(filterIpt);
46		- filterIpt.addEventListener('click', function() {
47		- const role = this.getAttribute('data-role-filter');
48		- if(this.checked) {
49		- addRole(role);
50		- } else {
51		- removeRole(role);
52		- }
53		- console.log(filters);
54		- })
55		- });
56		-
57		- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
58	58	const contextSearchType = document.getElementById("context-search-type");
59	59	const contextSearchText = document.getElementById("context-search-text");
60	60	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -70,51 +70,34 @@
70	70	handleXWikiSearch('bougaultx');
71	71	break
72	72	default:
73		- handleXWikiSearch('', applyAdministratorFilter)
	29	+ handleXWikiSearch()
74	74	}
75	75
76	76	});
77		- function handleXWikiSearch(space, callback) {
78		- require(['jquery'], function($) {
79		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
80		- const contextSearchButton = document.getElementById("context-search-button");
81		- const xwikiSpace = space ? `.${space}` : '';
82		- contextSearchButton.addEventListener('click', function() {
83		- $.post(solrServiceURL, {
84		- outputSyntax: 'plain',
85		- media: 'json',
86		- query: [
87		- 'q="__INPUT__"~100',
88		- 'fq=type:DOCUMENT',
89		- `fq=space:Collabs${xwikiSpace}.*`
90		- ].join('\n'),
91		- input: $('#context-search-text').val()
92		- }).then(res => {
93		- if(callback) {
94		- callback(res).then(results => {
95		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
96		- })
97		- } else {
98		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
99		- }
100		- });
101		- });
	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);
102	102	});
103		- }
104		- function applyAdministratorFilter(results) {
105		- return new Promise((resolve, reject) => {
106		- //fetch("/rest/v1/collabs?roles=administrator")
107		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
108		- .then(res => res.json())
109		- .then(collabs => {
110		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
111		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
112		- resolve(filtered);
113		- })
114	114
115		- })
116		- }
117		-});
	53	+ });
	54	+ });
	55	+}
	56	+ });
118	118
119	119
120	120	</script>