Changes for page Context Search
Last modified by bougault on 2023/02/20 16:29
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -5,6 +5,10 @@ 5 5 <option value="collabs">Collabs</option> 6 6 <option value="current-collab">Current Collab</option> 7 7 </select> 8 +<div> 9 +<label> 10 + <input type="checkbox" id="administratorFilter"> Administrator 11 +</label> 8 8 <input type="text" id="context-search-text" /> 9 9 <button id="context-search-button" class="btn btn-primary">Search</button> 10 10 ... ... @@ -26,11 +26,11 @@ 26 26 handleXWikiSearch('bougaultx'); 27 27 break 28 28 default: 29 - handleXWikiSearch() 33 + handleXWikiSearch('', applyAdministratorFilter) 30 30 } 31 31 32 32 }); 33 - function handleXWikiSearch(space) { 37 + function handleXWikiSearch(space, callback) { 34 34 require(['jquery'], function($) { 35 35 var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 36 36 const contextSearchButton = document.getElementById("context-search-button"); ... ... @@ -46,13 +46,29 @@ 46 46 ].join('\n'), 47 47 input: $('#context-search-text').val() 48 48 }).then(res => { 49 - contextSearchResponse.innerText = JSON.stringify(res, null, 2); 53 + if(callback) { 54 + callback(res).then(results => { 55 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 56 + }) 57 + } else { 58 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 59 + } 50 50 }); 51 51 }); 52 52 }); 53 53 } 54 - function getCurrentUserCollabs() { 55 - fetch("/rest/v1/identity/users/me").then(user => user.username).then(username => console.log(username)) 64 + function applyAdministratorFilter(results) { 65 + return new Promise((resolve, reject) => { 66 + //fetch("/rest/v1/collabs?roles=administrator") 67 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 68 + .then(res => res.json()) 69 + .then(collabs => { 70 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 71 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 72 + resolve(filtered); 73 + }) 74 + 75 + }) 56 56 } 57 57 }); 58 58