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,5 +1,19 @@ 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 + class UnifiedSearch extends LitElement { 5 + render() { 6 + return html`<div> 7 + <input type="text" placeholder="Search..." /> 8 + <button>Search</button> 9 +</div>` 10 + } 11 + } 12 + customElements.define('clb-unified-search', UnifiedSearch); 13 +</script> 2 2 15 +<clb-unified-search></clb-unified-search> 16 + 3 3 <select id="context-search-type"> 4 4 <option value="all">All</option> 5 5 <option value="collabs">Collabs</option> ... ... @@ -7,22 +7,62 @@ 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> 24 +<div class="form-group"> 25 + <label> 26 + <input type="checkbox" data-role-filter="administrator"> Administrator 27 + </label> 28 + <label> 29 + <input type="checkbox" data-role-filter="editor"> Editor 30 + </label> 31 +</div> 10 10 33 + 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 - */ 25 25 window.addEventListener('DOMContentLoaded', function() { 37 + const filters = { 38 + search: '', 39 + offset: 0, 40 + orderField: 'title', 41 + order: 'asc', 42 + favorite: false, 43 + roles: [] // to be joined as administrator+editor+viewer 44 + }; 45 + 46 + function addRole(role) { 47 + if(filters.roles.indexOf(role) == -1) { 48 + filters.roles.push(role); 49 + } 50 + } 51 + 52 + function removeRole(role) { 53 + filters.roles = filters.roles.filter(r => r !== role) 54 + } 55 + 56 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 57 + 58 + filterInputs.forEach(function(filterIpt) { 59 + filterIpt.addEventListener('click', function() { 60 + const role = this.getAttribute('data-role-filter'); 61 + if(this.checked) { 62 + addRole(role); 63 + } else { 64 + removeRole(role); 65 + } 66 + runFilteredRequest(); 67 + }) 68 + }); 69 + 70 + function runFilteredRequest() { 71 + const urlParams = new URLSearchParams(); 72 + const tmpFilters = filters; 73 + tmpFilters.roles = tmpFilters.roles.join("+"); 74 + for(filter in tmpFilters) { 75 + urlParams.set(filter, tmpFilters[filter]); 76 + } 77 + console.log(urlParams); 78 + } 79 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 26 26 const contextSearchType = document.getElementById("context-search-type"); 27 27 const contextSearchText = document.getElementById("context-search-text"); 28 28 const contextSearchResponse = document.getElementById("context-search-response"); ... ... @@ -35,35 +35,55 @@ 35 35 document.location.href = `/bin/view/Collabs/#search=${term}`; 36 36 break; 37 37 case 'current-collab': 38 - //fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results); 39 39 handleXWikiSearch('bougaultx'); 40 40 break 41 41 default: 42 - handleXWikiSearch() 43 - //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results); 95 + handleXWikiSearch('') 44 44 } 45 45 46 46 }); 47 - }); 48 - 49 -function handleXWikiSearch(space) { 50 - require(['jquery'], function($) { 51 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 52 - const contextSearchButton = document.getElementById("context-search-button"); 53 - const xwikiSpace = space ? `.${space}` : ''; 54 - contextSearchButton.addEventListener('click', function() { 55 - $.post(solrServiceURL, { 56 - outputSyntax: 'plain', 57 - media: 'json', 58 - query: [ 59 - 'q=*__INPUT__*', 60 - 'fq=type:DOCUMENT', 61 - `fq=space:Collabs${xwikiSpace}.*` 62 - ].join('\n'), 63 - input: $('#context-search-text').val() 64 - }); 99 + function handleXWikiSearch(space, callback) { 100 + require(['jquery'], function($) { 101 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 102 + const contextSearchButton = document.getElementById("context-search-button"); 103 + const xwikiSpace = space ? `.${space}` : ''; 104 + contextSearchButton.addEventListener('click', function() { 105 + $.post(solrServiceURL, { 106 + outputSyntax: 'plain', 107 + media: 'json', 108 + query: [ 109 + 'q="__INPUT__"~100', 110 + 'fq=type:DOCUMENT', 111 + `fq=space:Collabs${xwikiSpace}.*` 112 + ].join('\n'), 113 + input: $('#context-search-text').val() 114 + }).then(res => { 115 + if(callback) { 116 + callback(res).then(results => { 117 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 118 + }) 119 + } else { 120 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 121 + } 122 + }); 123 + }); 65 65 }); 66 - }); 67 -} 125 + } 126 + function applyAdministratorFilter(results) { 127 + return new Promise((resolve, reject) => { 128 + //fetch("/rest/v1/collabs?roles=administrator") 129 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 130 + .then(res => res.json()) 131 + .then(collabs => { 132 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 133 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 134 + resolve(filtered); 135 + }) 136 + 137 + }) 138 + } 139 +}); 140 + 141 + 68 68 </script> 69 69 {{/html}}