| ... |
... |
@@ -18,6 +18,7 @@ |
| 18 |
18 |
contextSearchButton.addEventListener('click', function() { |
| 19 |
19 |
const context = contextSearchType.options[contextSearchType.selectedIndex].value; |
| 20 |
20 |
const term = contextSearchText.value; |
|
21 |
+ searchWithAdministratorFilter(term); |
| 21 |
21 |
switch(context) { |
| 22 |
22 |
case 'collabs': |
| 23 |
23 |
document.location.href = `/bin/view/Collabs/#search=${term}`; |
| ... |
... |
@@ -30,31 +30,48 @@ |
| 30 |
30 |
} |
| 31 |
31 |
|
| 32 |
32 |
}); |
| 33 |
|
- |
| 34 |
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); |
|
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__"~100', |
|
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); |
|
51 |
+ }); |
|
52 |
+ }); |
| 51 |
51 |
}); |
|
54 |
+ } |
|
55 |
+ function searchWithAdministratorFilter(term) { |
|
56 |
+ let xwikiSpace = ""; |
|
57 |
+ // parameters are set according to ticked filter. Hardcoded for POC |
|
58 |
+ Promise.all([ |
|
59 |
+ fetch("/rest/v1/collabs?roles=administrator"), |
|
60 |
+ fetch("/bin/get/XWiki/SuggestSolrService", { |
|
61 |
+ method: "POST", |
|
62 |
+ body: { |
|
63 |
+ outputSyntax: 'plain', |
|
64 |
+ media: 'json', |
|
65 |
+ query: [ |
|
66 |
+ 'q="__INPUT__"~100', |
|
67 |
+ 'fq=type:DOCUMENT', |
|
68 |
+ `fq=space:Collabs${xwikiSpace}.*` |
|
69 |
+ ].join('\n'), |
|
70 |
+ input: term |
|
71 |
+ }}) |
|
72 |
+ ]).then(res => console.log("Search with administrator", res)) |
|
73 |
+ } |
|
74 |
+}); |
| 52 |
52 |
|
| 53 |
|
- }); |
| 54 |
|
- }); |
| 55 |
|
-} |
| 56 |
|
- }); |
| 57 |
57 |
|
| 58 |
|
- |
| 59 |
59 |
</script> |
| 60 |
60 |
{{/html}} |