Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -7,52 +7,21 @@
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>
	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	+ }
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");
...	...	@@ -65,55 +65,35 @@
65	65	document.location.href = `/bin/view/Collabs/#search=${term}`;
66	66	break;
67	67	case 'current-collab':
68		- handleXWikiSearch('bougaultx');
	37	+ fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
69	69	break
70	70	default:
71		- handleXWikiSearch('')
	40	+ fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
72	72	}
73	73
74	74	});
75		- function handleXWikiSearch(space, callback) {
76		- require(['jquery'], function($) {
77		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
78		- const contextSearchButton = document.getElementById("context-search-button");
79		- const xwikiSpace = space ? `.${space}` : '';
80		- contextSearchButton.addEventListener('click', function() {
81		- $.post(solrServiceURL, {
82		- outputSyntax: 'plain',
83		- media: 'json',
84		- query: [
85		- 'q="__INPUT__"~100',
86		- 'fq=type:DOCUMENT',
87		- `fq=space:Collabs${xwikiSpace}.*`
88		- ].join('\n'),
89		- input: $('#context-search-text').val()
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		- }
98		- });
99		- });
100		- });
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		- })
	44	+ });
	45	+*/
	46	+ console.log('hello world');
	47	+const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	48	+console.log('xxxxx', solrServiceURL);
112	112
113		- })
114		- }
	50	+require(['jquery'], function($) {
	51	+ console.log('ZZZZ');
	52	+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	53	+ const contextSearchButton = document.getElementById("context-search-button");
	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.bougaultx.*'
	62	+ ].join('\n'),
	63	+ input: $('#context-search-text').val()
	64	+ });
	65	+ });
115	115	});
116		-
117		-
118	118	</script>
119	119	{{/html}}