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,6 +1,6 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code wouldmust be reviewed / optimized and packaged for use in production !!!3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 4 --> 5 5 <script type="module"> 6 6 import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; ... ... @@ -36,11 +36,12 @@ 36 36 constructor() { 37 37 super(); 38 38 this.searchText = ""; 39 + this.prevSearchText = ""; 39 39 this.administrator = false; 40 40 this.editor = false; 41 41 this.viewer = false; 42 42 this.rolesFilter = []; 43 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite= true&roles=`);44 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`); 44 44 this.results = []; 45 45 } 46 46 toggleRoleFilter(roleName) { ... ... @@ -51,25 +51,52 @@ 51 51 } 52 52 this[roleName] = !this[roleName]; 53 53 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 55 + this.handleSearch(); 54 54 } 55 55 setSearchText(e) { 56 56 this.searchText = e.target.value; 57 57 } 58 58 handleSearch() { 59 - console.log(this.searchText); 60 - if(this.searchText !== "") { 61 - this.fetchWikiSearch(); 61 + if(this.searchText !== "" && this.searchText !== this.prevSearchText) { 62 + this.prevSearchText = this.searchText; 63 + Promise.all([ 64 + this.fetchWikiSearch(), 65 + this.fetchFilterSearch() 66 + ]).then(([wikiSearchResults, collabSearchResults]) => { 67 + console.log(wikiSearchResults, collabSearchResults); 68 + }); 69 + } else if (this.searchText === this.prevSearchText) { 70 + console.log("Only apply filter on results"); 71 + this.fetchFilterSearch().then(res => res.json()).then(this.filterResults) 72 + } else { 73 + console.log("no search text, should return filter search results if any"); 74 + this.fetchFilterSearch().then(res => res.json()).then(collabs => { 75 + console.log("Format and display collabs", collabs); 76 + }) 62 62 } 63 63 } 79 + hasActiveFilters() { 80 + // we only look at role filters for POC. 81 + return this.roles.length > 0; 82 + } 64 64 fetchWikiSearch() { 65 65 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 66 - handleXWikiSearch(this.searchText) .then(results => this.results = results);85 + return handleXWikiSearch(this.searchText); 67 67 } 68 - buildFilter() { 69 - //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 87 + fetchFilterSearch() { 88 + return new Promise((resolve) => { 89 + if(this.hasActiveFilters) { 90 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 91 + } else { 92 + resolve(null); 93 + } 94 + }); 70 70 } 96 + filterResults(filteredCollabs) { 97 + console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 98 + } 71 71 getLink(xwikiDocSpace) { 72 - return `/bin/view/${xwikiDocSpace.replace('.', '/')}`; 100 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 73 73 } 74 74 render() { 75 75 return html` ... ... @@ -87,8 +87,8 @@ 87 87 ${this.results.map(result => html` 88 88 <div class="result"> 89 89 <a href="${this.getLink(result.space)}">${result.title_}</a> 90 - <div class="light">${result.space}</div> 91 91 <div>${result.doccontent_.substring(0, 150)} 119 + <div class="light">${result.space.replaceAll('.', ' / ')}</div> 92 92 </div> 93 93 `)} 94 94 </div> ... ... @@ -121,130 +121,5 @@ 121 121 </script> 122 122 123 123 <clb-unified-search></clb-unified-search> 124 -<!-- 125 -<select id="context-search-type"> 126 - <option value="all">All</option> 127 - <option value="collabs">Collabs</option> 128 - <option value="current-collab">Current Collab</option> 129 -</select> 130 -<input type="text" id="context-search-text" /> 131 -<button id="context-search-button" class="btn btn-primary">Search</button> 132 -<div class="form-group"> 133 - <label> 134 - <input type="checkbox" data-role-filter="administrator"> Administrator 135 - </label> 136 - <label> 137 - <input type="checkbox" data-role-filter="editor"> Editor 138 - </label> 139 -</div> 140 140 141 - 142 -<pre id="context-search-response"></pre> 143 -<script> 144 - window.addEventListener('DOMContentLoaded', function() { 145 - const filters = { 146 - search: '', 147 - offset: 0, 148 - orderField: 'title', 149 - order: 'asc', 150 - favorite: false, 151 - roles: [] // to be joined as administrator+editor+viewer 152 - }; 153 - 154 - function addRole(role) { 155 - if(filters.roles.indexOf(role) == -1) { 156 - filters.roles.push(role); 157 - } 158 - } 159 - 160 - function removeRole(role) { 161 - filters.roles = filters.roles.filter(r => r !== role) 162 - } 163 - 164 - const filterInputs = document.querySelectorAll('input[data-role-filter]'); 165 - 166 - filterInputs.forEach(function(filterIpt) { 167 - filterIpt.addEventListener('click', function() { 168 - const role = this.getAttribute('data-role-filter'); 169 - if(this.checked) { 170 - addRole(role); 171 - } else { 172 - removeRole(role); 173 - } 174 - runFilteredRequest(); 175 - }) 176 - }); 177 - 178 - function runFilteredRequest() { 179 - const urlParams = new URLSearchParams(); 180 - const tmpFilters = filters; 181 - tmpFilters.roles = tmpFilters.roles.join("+"); 182 - for(filter in tmpFilters) { 183 - urlParams.set(filter, tmpFilters[filter]); 184 - } 185 - console.log(urlParams); 186 - } 187 - // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 188 - const contextSearchType = document.getElementById("context-search-type"); 189 - const contextSearchText = document.getElementById("context-search-text"); 190 - const contextSearchResponse = document.getElementById("context-search-response"); 191 - const contextSearchButton = document.getElementById("context-search-button"); 192 - contextSearchButton.addEventListener('click', function() { 193 - const context = contextSearchType.options[contextSearchType.selectedIndex].value; 194 - const term = contextSearchText.value; 195 - switch(context) { 196 - case 'collabs': 197 - document.location.href = `/bin/view/Collabs/#search=${term}`; 198 - break; 199 - case 'current-collab': 200 - handleXWikiSearch('bougaultx'); 201 - break 202 - default: 203 - handleXWikiSearch('') 204 - } 205 - 206 - }); 207 - function handleXWikiSearch(space, callback) { 208 - require(['jquery'], function($) { 209 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 210 - const contextSearchButton = document.getElementById("context-search-button"); 211 - const xwikiSpace = space ? `.${space}` : ''; 212 - contextSearchButton.addEventListener('click', function() { 213 - $.post(solrServiceURL, { 214 - outputSyntax: 'plain', 215 - media: 'json', 216 - query: [ 217 - 'q="__INPUT__"~100', 218 - 'fq=type:DOCUMENT', 219 - `fq=space:Collabs${xwikiSpace}.*` 220 - ].join('\n'), 221 - input: $('#context-search-text').val() 222 - }).then(res => { 223 - if(callback) { 224 - callback(res).then(results => { 225 - contextSearchResponse.innerText = JSON.stringify(results, null, 2); 226 - }) 227 - } else { 228 - contextSearchResponse.innerText = JSON.stringify(res, null, 2); 229 - } 230 - }); 231 - }); 232 - }); 233 - } 234 - function applyAdministratorFilter(results) { 235 - return new Promise((resolve, reject) => { 236 - //fetch("/rest/v1/collabs?roles=administrator") 237 - fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 238 - .then(res => res.json()) 239 - .then(collabs => { 240 - const spaces = collabs.map(collab => `Collabs.${collab.name}`); 241 - const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 242 - resolve(filtered); 243 - }) 244 - 245 - }) 246 - } 247 -}); 248 -</script> 249 ---> 250 250 {{/html}}