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,21 @@ 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> 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 + } 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"); ... ... @@ -79,55 +79,31 @@ 79 79 document.location.href = `/bin/view/Collabs/#search=${term}`; 80 80 break; 81 81 case 'current-collab': 82 - han dleXWikiSearch('bougaultx');37 + fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results); 83 83 break 84 84 default: 85 - han dleXWikiSearch('')40 + fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results); 86 86 } 87 87 88 88 }); 89 - function handleXWikiSearch(space, callback) { 90 - require(['jquery'], function($) { 91 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 92 - const contextSearchButton = document.getElementById("context-search-button"); 93 - const xwikiSpace = space ? `.${space}` : ''; 94 - contextSearchButton.addEventListener('click', function() { 95 - $.post(solrServiceURL, { 96 - outputSyntax: 'plain', 97 - media: 'json', 98 - query: [ 99 - 'q="__INPUT__"~100', 100 - 'fq=type:DOCUMENT', 101 - `fq=space:Collabs${xwikiSpace}.*` 102 - ].join('\n'), 103 - input: $('#context-search-text').val() 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 - } 112 - }); 113 - }); 44 + }); 45 +*/ 46 +require(['jquery'], function($) { 47 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 48 + const contextSearchButton = document.getElementById("context-search-button"); 49 + contextSearchButton.addEventListener('click', function() { 50 + $.post(solrServiceURL, { 51 + outputSyntax: 'plain', 52 + media: 'json', 53 + query: [ 54 + 'q=*__INPUT__*', 55 + 'fq=type:DOCUMENT', 56 + 'fq=class:XWiki.XWikiUsers', 57 + 'qf=property.XWiki.XWikiUsers.last_name^10 property.XWiki.XWikiUsers.first_name^5 name^2.5' 58 + ].join('\n'), 59 + input: $('#context-search-text').val() 114 114 }); 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 - }) 128 - } 61 + }); 129 129 }); 130 - 131 - 132 132 </script> 133 133 {{/html}}