Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -5,51 +5,24 @@
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	15	<pre id="context-search-response"></pre>
16	16	<script>
	13	+ /*
	14	+ async function fetchGlobalSearch(term) {
	15	+ const res = await fetch(`/rest/wikis/query?q=${term}&media=json`)
	16	+ const json = await res.json();
	17	+ return JSON.stringify(json, null, 2);
	18	+ }
	19	+ async function fetchCurrentCollabSearch(term) {
	20	+ const res = await fetch(`/rest/wikis/xwiki/spaces/Collabs/spaces/bougaultx/search?q=${term}&media=json`)
	21	+ const json = await res.json();
	22	+ return JSON.stringify(json, null, 2);
	23	+ }
	24	+ */
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		- const filterInputs = document.querySelector('checkbox[data-role-filter]');
38		- console.log(filterInputs);
39		- filterInputs.forEach(function(filterIpt) {
40		- console.log(filterIpt);
41		- filter.addEventListener('click', function() {
42		- const role = this.getAttribute('data-role-filter');
43		- if(this.checked) {
44		- addRole(role);
45		- } else {
46		- removeRole(role);
47		- }
48		- console.log(filters);
49		- })
50		- });
51		-
52		- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
53	53	const contextSearchType = document.getElementById("context-search-type");
54	54	const contextSearchText = document.getElementById("context-search-text");
55	55	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -62,55 +62,35 @@
62	62	document.location.href = `/bin/view/Collabs/#search=${term}`;
63	63	break;
64	64	case 'current-collab':
	38	+ //fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
65	65	handleXWikiSearch('bougaultx');
66	66	break
67	67	default:
68		- handleXWikiSearch('', applyAdministratorFilter)
	42	+ handleXWikiSearch()
	43	+ //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
69	69	}
70	70
71	71	});
72		- function handleXWikiSearch(space, callback) {
73		- require(['jquery'], function($) {
74		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
75		- const contextSearchButton = document.getElementById("context-search-button");
76		- const xwikiSpace = space ? `.${space}` : '';
77		- contextSearchButton.addEventListener('click', function() {
78		- $.post(solrServiceURL, {
79		- outputSyntax: 'plain',
80		- media: 'json',
81		- query: [
82		- 'q="__INPUT__"~100',
83		- 'fq=type:DOCUMENT',
84		- `fq=space:Collabs${xwikiSpace}.*`
85		- ].join('\n'),
86		- input: $('#context-search-text').val()
87		- }).then(res => {
88		- if(callback) {
89		- callback(res).then(results => {
90		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
91		- })
92		- } else {
93		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
94		- }
95		- });
96		- });
97		- });
98		- }
99		- function applyAdministratorFilter(results) {
100		- return new Promise((resolve, reject) => {
101		- //fetch("/rest/v1/collabs?roles=administrator")
102		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
103		- .then(res => res.json())
104		- .then(collabs => {
105		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
106		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
107		- resolve(filtered);
108		- })
	47	+ });
109	109
110		- })
111		- }
112		-});
113		-
114		-
	49	+function handleXWikiSearch(space) {
	50	+ require(['jquery'], function($) {
	51	+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	52	+ const contextSearchButton = document.getElementById("context-search-button");
	53	+ const xwikiSpace = space ? `.${space}` : '';
	54	+ contextSearchButton.addEventListener('click', function() {
	55	+ $.post(solrServiceURL, {
	56	+ outputSyntax: 'plain',
	57	+ media: 'json',
	58	+ query: [
	59	+ 'q=*__INPUT__*',
	60	+ 'fq=type:DOCUMENT',
	61	+ `fq=space:Collabs${xwikiSpace}.*`
	62	+ ].join('\n'),
	63	+ input: $('#context-search-text').val()
	64	+ });
	65	+ });
	66	+ });
	67	+}
115	115	</script>
116	116	{{/html}}