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
-
... ... @@ -7,57 +7,10 @@ 7 7 </select> 8 8 <input type="text" id="context-search-text" /> 9 9 <button id="context-search-button" class="btn btn-primary">Search</button> 10 -<div class="form-group"> 11 - <label> 12 - <input type="checkbox" data-role-filter="administrator"> Administrator 13 - </label> 14 - <label> 15 - <input type="checkbox" data-role-filter="editor"> Editor 16 - </label> 17 -</div> 18 18 19 - 20 20 <pre id="context-search-response"></pre> 21 21 <script> 22 22 window.addEventListener('DOMContentLoaded', function() { 23 - const filters = { 24 - search: '', 25 - offset: 0, 26 - orderField: 'title', 27 - order: 'asc', 28 - favorite: false, 29 - roles: [] // to be joined as administrator+editor+viewer 30 - }; 31 - 32 - function addRole(role) { 33 - if(filters.roles.indexOf(role) == -1) { 34 - filters.roles.push(role); 35 - } 36 - } 37 - 38 - function removeRole(role) { 39 - filters.roles = filters.roles.filter(r => r !== role) 40 - } 41 - 42 - const filterInputs = document.querySelectorAll('input[data-role-filter]'); 43 - 44 - filterInputs.forEach(function(filterIpt) { 45 - filterIpt.addEventListener('click', function() { 46 - const role = this.getAttribute('data-role-filter'); 47 - if(this.checked) { 48 - addRole(role); 49 - } else { 50 - removeRole(role); 51 - } 52 - }) 53 - }); 54 - 55 - function filteredRequest() { 56 - for(filter in filters) { 57 - console.log(filter); 58 - } 59 - } 60 - // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 61 61 const contextSearchType = document.getElementById("context-search-type"); 62 62 const contextSearchText = document.getElementById("context-search-text"); 63 63 const contextSearchResponse = document.getElementById("context-search-response"); ... ... @@ -65,6 +65,7 @@ 65 65 contextSearchButton.addEventListener('click', function() { 66 66 const context = contextSearchType.options[contextSearchType.selectedIndex].value; 67 67 const term = contextSearchText.value; 21 + searchWithAdministratorFilter(term); 68 68 switch(context) { 69 69 case 'collabs': 70 70 document.location.href = `/bin/view/Collabs/#search=${term}`; ... ... @@ -73,11 +73,11 @@ 73 73 handleXWikiSearch('bougaultx'); 74 74 break 75 75 default: 76 - handleXWikiSearch( '')30 + handleXWikiSearch() 77 77 } 78 78 79 79 }); 80 - function handleXWikiSearch(space , callback) {34 + function handleXWikiSearch(space) { 81 81 require(['jquery'], function($) { 82 82 var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 83 83 const contextSearchButton = document.getElementById("context-search-button"); ... ... @@ -93,29 +93,29 @@ 93 93 ].join('\n'), 94 94 input: $('#context-search-text').val() 95 95 }).then(res => { 96 - if(callback) { 97 - callback(res).then(results => { 98 - contextSearchResponse.innerText = JSON.stringify(results, null, 2); 99 - }) 100 - } else { 101 - contextSearchResponse.innerText = JSON.stringify(res, null, 2); 102 - } 50 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 103 103 }); 104 104 }); 105 105 }); 106 106 } 107 - function applyAdministratorFilter(results) { 108 - return new Promise((resolve, reject) => { 109 - //fetch("/rest/v1/collabs?roles=administrator") 110 - fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 111 - .then(res => res.json()) 112 - .then(collabs => { 113 - const spaces = collabs.map(collab => `Collabs.${collab.name}`); 114 - const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 115 - resolve(filtered); 116 - }) 117 - 118 - }) 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)) 119 119 } 120 120 }); 121 121