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