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,28 @@ 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 + static properties = { 6 + searchText: { type: String } 7 + } 8 + setSearchText(e) { 9 + this.searchText = e.target.value; 10 + } 11 + handleSearch() { 12 + console.log(this.searchText); 13 + } 14 + render() { 15 + return html`<div> 16 + <input @change="${setSearchText}" type="text" placeholder="Search..." /> 17 + <button @click="${handleSearch}">Search</button> 18 +</div>` 19 + } 20 + } 21 + customElements.define('clb-unified-search', UnifiedSearch); 22 +</script> 2 2 24 +<clb-unified-search></clb-unified-search> 25 + 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> 33 +<div class="form-group"> 34 + <label> 35 + <input type="checkbox" data-role-filter="administrator"> Administrator 36 + </label> 37 + <label> 38 + <input type="checkbox" data-role-filter="editor"> Editor 39 + </label> 40 +</div> 10 10 42 + 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() { 46 + const filters = { 47 + search: '', 48 + offset: 0, 49 + orderField: 'title', 50 + order: 'asc', 51 + favorite: false, 52 + roles: [] // to be joined as administrator+editor+viewer 53 + }; 54 + 55 + function addRole(role) { 56 + if(filters.roles.indexOf(role) == -1) { 57 + filters.roles.push(role); 58 + } 59 + } 60 + 61 + function removeRole(role) { 62 + filters.roles = filters.roles.filter(r => r !== role) 63 + } 64 + 65 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 66 + 67 + filterInputs.forEach(function(filterIpt) { 68 + filterIpt.addEventListener('click', function() { 69 + const role = this.getAttribute('data-role-filter'); 70 + if(this.checked) { 71 + addRole(role); 72 + } else { 73 + removeRole(role); 74 + } 75 + runFilteredRequest(); 76 + }) 77 + }); 78 + 79 + function runFilteredRequest() { 80 + const urlParams = new URLSearchParams(); 81 + const tmpFilters = filters; 82 + tmpFilters.roles = tmpFilters.roles.join("+"); 83 + for(filter in tmpFilters) { 84 + urlParams.set(filter, tmpFilters[filter]); 85 + } 86 + console.log(urlParams); 87 + } 88 + // 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); 104 + 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 - }); 108 + function handleXWikiSearch(space, callback) { 109 + require(['jquery'], function($) { 110 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 111 + const contextSearchButton = document.getElementById("context-search-button"); 112 + const xwikiSpace = space ? `.${space}` : ''; 113 + contextSearchButton.addEventListener('click', function() { 114 + $.post(solrServiceURL, { 115 + outputSyntax: 'plain', 116 + media: 'json', 117 + query: [ 118 + 'q="__INPUT__"~100', 119 + 'fq=type:DOCUMENT', 120 + `fq=space:Collabs${xwikiSpace}.*` 121 + ].join('\n'), 122 + input: $('#context-search-text').val() 123 + }).then(res => { 124 + if(callback) { 125 + callback(res).then(results => { 126 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 127 + }) 128 + } else { 129 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 130 + } 131 + }); 132 + }); 65 65 }); 66 - }); 67 -} 134 + } 135 + function applyAdministratorFilter(results) { 136 + return new Promise((resolve, reject) => { 137 + //fetch("/rest/v1/collabs?roles=administrator") 138 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 139 + .then(res => res.json()) 140 + .then(collabs => { 141 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 142 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 143 + resolve(filtered); 144 + }) 145 + 146 + }) 147 + } 148 +}); 149 + 150 + 68 68 </script> 69 69 {{/html}}