Changes for page Context Search Axel
Last modified by messines on 2022/10/14 11:41
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -10,17 +10,6 @@ 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 - } 24 24 window.addEventListener('DOMContentLoaded', function() { 25 25 const contextSearchType = document.getElementById("context-search-type"); 26 26 const contextSearchText = document.getElementById("context-search-text"); ... ... @@ -34,32 +34,38 @@ 34 34 document.location.href = `/bin/view/Collabs/#search=${term}`; 35 35 break; 36 36 case 'current-collab': 37 - fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);26 + handleXWikiSearch('bougaultx'); 38 38 break 39 39 default: 40 - fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);29 + handleXWikiSearch() 41 41 } 42 42 43 43 }); 44 - });45 - */46 -require(['jquery'], function($) { 47 - console. log('ZZZZ');48 - varsolrServiceURL=new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');49 - const contextSearchButton=document.getElementById("context-search-button");50 - contextSearchButton.addEventListener('click', function() { 33 + 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() { 51 51 $.post(solrServiceURL, { 52 - outputSyntax: 'plain', 53 - media: 'json', 54 - query: [ 55 - 'q=*__INPUT__*', 56 - 'fq=type:DOCUMENT', 57 - 'fq=class:XWiki.XWikiUsers', 58 - 'qf=property.XWiki.XWikiUsers.last_name^10 property.XWiki.XWikiUsers.first_name^5 name^2.5' 59 - ].join('\n'), 60 - input: $('#context-search-text').val() 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); 61 61 }); 52 + 53 + }); 62 62 }); 63 -}); 55 +} 56 + }); 57 + 58 + 64 64 </script> 65 65 {{/html}}