Changes for page UpdateUserVelocity

Summary

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

Details

Page properties

Title

...	...	@@ -1,1 +1,1 @@
1		-UpdateUserVelocity
	1	+Context Search

Author

...	...	@@ -1,1 +1,1 @@
1		-XWiki.messines
	1	+XWiki.bougault

Content

...	...	@@ -1,14 +1,31 @@
1	1	{{html clean="false"}}
2	2
3		-<button id="context-script-button" class="btn btn-primary">Execute Script</button>
	3	+<select id="context-search-type">
	4	+ <option value="all">All</option>
	5	+ <option value="collabs">Collabs</option>
	6	+ <option value="current-collab">Current Collab</option>
	7	+</select>
	8	+<input type="text" id="context-search-text" />
	9	+<button id="context-search-button" class="btn btn-primary">Search</button>
4	4
5	5	<pre id="context-search-response"></pre>
6	6	<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	+ }
7	7	window.addEventListener('DOMContentLoaded', function() {
8	8	const contextSearchType = document.getElementById("context-search-type");
9	9	const contextSearchText = document.getElementById("context-search-text");
10	10	const contextSearchResponse = document.getElementById("context-search-response");
11		- const contextSearchButton = document.getElementById("context-script-button");
	28	+ const contextSearchButton = document.getElementById("context-search-button");
12	12	contextSearchButton.addEventListener('click', function() {
13	13	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
14	14	const term = contextSearchText.value;
...	...	@@ -17,38 +17,31 @@
17	17	document.location.href = `/bin/view/Collabs/#search=${term}`;
18	18	break;
19	19	case 'current-collab':
20		- handleXWikiSearch('bougaultx');
	37	+ fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
21	21	break
22	22	default:
23		- handleXWikiSearch()
	40	+ fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
24	24	}
25	25
26	26	});
27		-
28		- function handleXWikiSearch(space) {
29		- require(['jquery'], function($) {
30		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
31		- const contextSearchButton = document.getElementById("context-script-button");
32		- const xwikiSpace = space ? `.${space}` : '';
33		- contextSearchButton.addEventListener('click', function() {
	44	+ });
	45	+*/
	46	+require(['jquery'], function($) {
	47	+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	48	+ const contextSearchButton = document.getElementById("context-search-button");
	49	+ contextSearchButton.addEventListener('click', function() {
34	34	$.post(solrServiceURL, {
35		- outputSyntax: 'plain',
36		- media: 'json',
37		- query: [
38		- 'q=title:"__INPUT__"~100 OR doccontent:"__INPUT__"~100',
39		- 'fq=type:DOCUMENT',
40		- `fq=space:Collabs${xwikiSpace}.*`
41		- ].join('\n'),
42		- input: $('#context-search-text').val()
43		- }).then(res => {
44		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	51	+ outputSyntax: 'plain',
	52	+ media: 'json',
	53	+ query: [
	54	+ 'q=*__INPUT__*',
	55	+ 'fq=type:DOCUMENT',
	56	+ 'fq=class:XWiki.XWikiUsers',
	57	+ 'qf=property.XWiki.XWikiUsers.last_name^10 property.XWiki.XWikiUsers.first_name^5 name^2.5'
	58	+ ].join('\n'),
	59	+ input: $('#context-search-text').val()
45	45	});
46		-
47		- });
48	48	});
49		-}
50		- });
51		-
52		-
	62	+});
53	53	</script>
54	54	{{/html}}