| ... |
... |
@@ -10,6 +10,17 @@ |
| 10 |
10 |
|
| 11 |
11 |
<pre id="context-search-response"></pre> |
| 12 |
12 |
<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 |
+ } |
| 13 |
13 |
window.addEventListener('DOMContentLoaded', function() { |
| 14 |
14 |
const contextSearchType = document.getElementById("context-search-type"); |
| 15 |
15 |
const contextSearchText = document.getElementById("context-search-text"); |
| ... |
... |
@@ -23,34 +23,29 @@ |
| 23 |
23 |
document.location.href = `/bin/view/Collabs/#search=${term}`; |
| 24 |
24 |
break; |
| 25 |
25 |
case 'current-collab': |
| 26 |
|
- handleXWikiSearch('bougaultx'); |
|
37 |
+ fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results); |
| 27 |
27 |
break |
| 28 |
28 |
default: |
| 29 |
|
- handleXWikiSearch() |
|
40 |
+ fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results); |
| 30 |
30 |
} |
| 31 |
31 |
|
| 32 |
32 |
}); |
| 33 |
33 |
}); |
| 34 |
|
- |
| 35 |
|
-function handleXWikiSearch(space) { |
| 36 |
|
- require(['jquery'], function($) { |
| 37 |
|
- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
| 38 |
|
- const contextSearchButton = document.getElementById("context-search-button"); |
| 39 |
|
- const xwikiSpace = space ? `.${space}` : ''; |
| 40 |
|
- contextSearchButton.addEventListener('click', function() { |
| 41 |
|
- $.post(solrServiceURL, { |
| 42 |
|
- outputSyntax: 'plain', |
| 43 |
|
- media: 'json', |
| 44 |
|
- query: [ |
| 45 |
|
- 'q=*__INPUT__*', |
| 46 |
|
- 'fq=type:DOCUMENT', |
| 47 |
|
- `fq=space:Collabs${xwikiSpace}.*` |
| 48 |
|
- ].join('\n'), |
| 49 |
|
- input: $('#context-search-text').val() |
| 50 |
|
- }).then(console.log); |
| 51 |
|
- |
| 52 |
|
- }); |
|
45 |
+*/ |
|
46 |
+require(['jquery'], function($) { |
|
47 |
+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
|
48 |
+ console.log('xxxx', solrServiceURL); |
|
49 |
+ $.post(solrServiceURL, { |
|
50 |
+ outputSyntax: 'plain', |
|
51 |
+ media: 'json', |
|
52 |
+ query: [ |
|
53 |
+ 'q=*__INPUT__*', |
|
54 |
+ 'fq=type:DOCUMENT', |
|
55 |
+ 'fq=class:XWiki.XWikiUsers', |
|
56 |
+ 'qf=property.XWiki.XWikiUsers.last_name^10 property.XWiki.XWikiUsers.first_name^5 name^2.5' |
|
57 |
+ ].join('\n'), |
|
58 |
+ input: $('#context-search-text').val() |
| 53 |
53 |
}); |
| 54 |
|
-} |
|
60 |
+}); |
| 55 |
55 |
</script> |
| 56 |
56 |
{{/html}} |