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,64 +1,124 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code would must be reviewed / optimized and packaged for use in production !!! 3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 + !!! Many optimisations can be done !!! 4 4 --> 5 5 <script type="module"> 6 -import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 7 +import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 7 7 window.addEventListener('DOMContentLoaded', function() { 8 8 9 9 class UnifiedSearch extends LitElement { 10 - /* 11 11 static properties = { 12 - searchText: { type: String }, 13 - favoritesFilter: { type: Boolean }, 14 - administratorFilter: { type: Boolean }, 15 - editorFilter: { type: Boolean }, 16 - viewerFilter: { type: Boolean }, 17 - publicFilter: { type: Boolean }, 18 - privateFilter: { type: Boolean }, 12 + results: { type: Array } 19 19 } 20 - */ 14 + static styles = css` 15 + :host > div { 16 + padding-bottom: 4em; 17 + } 18 + .result { 19 + margin-top: 1em; 20 + } 21 + .light { 22 + color: var(--color-gray-500, #CCC); 23 + font-size: 14px; 24 + } 25 + a { 26 + color: var(--color-brand-primary, blue); 27 + } 28 + `; 21 21 constructor() { 22 22 super(); 23 23 this.searchText = ""; 32 + this.prevSearchText = ""; 24 24 this.administrator = false; 25 25 this.editor = false; 26 26 this.viewer = false; 27 27 this.rolesFilter = []; 28 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite= true&roles=`);37 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 29 29 this.results = []; 39 + this.resultsCache = []; 30 30 } 41 + firstUpdated() { 42 + this.renderRoot.getElementById('searchInput').focus(); 43 + } 31 31 toggleRoleFilter(roleName) { 32 - if(this.rolesFilter.indexOf(roleName) == -1) { 45 + if(this.rolesFilter.indexOf(roleName) === -1) { 33 33 this.rolesFilter.push(roleName); 34 34 } else { 35 - this.rolesFilter.filter(role => role !== roleName); 48 + this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 36 36 } 37 37 this[roleName] = !this[roleName]; 38 38 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 52 + this.handleSearch(); 39 39 } 40 40 setSearchText(e) { 41 41 this.searchText = e.target.value; 42 42 } 43 - handleSearch() { 44 - console.log(this.searchText); 45 - if(this.searchText !== "") { 46 - this.fetchWikiSearch(); 57 + handleSearch(textSearch) { 58 + if(this.searchText !== "" || textSearch) { 59 + if(this.searchText !== this.prevSearchText) { 60 + this.clearResults(); 61 + this.prevSearchText = this.searchText; 62 + this.fetchWikiSearch().then(results => { 63 + this.resultsCache = results; 64 + if(this.hasActiveFilters()) { 65 + this.fetchFilterSearch().then(this.filterResults); 66 + } else { 67 + this.results = results; 68 + } 69 + }) 70 + } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 71 + this.fetchFilterSearch().then(this.filterResults) 72 + } else { 73 + this.results = this.resultsCache; 74 + } 75 + } else { 76 + this.clearResults(); 77 + console.log("no search text, should return filter search results if any"); 78 + this.fetchFilterSearch().then(collabs => { 79 + console.log("Format and display collabs", collabs); 80 + }) 47 47 } 48 48 } 83 + hasActiveFilters() { 84 + // we only look at role filters for POC. 85 + return this.rolesFilter.length > 0; 86 + } 49 49 fetchWikiSearch() { 50 50 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 51 - handleXWikiSearch(this.searchText) .then(results => this.results = results);89 + return handleXWikiSearch(this.searchText); 52 52 } 53 - buildFilter() { 54 - //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 91 + fetchFilterSearch() { 92 + return new Promise((resolve) => { 93 + if(this.hasActiveFilters()) { 94 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 95 + } else { 96 + resolve([]); 97 + } 98 + }); 55 55 } 100 + filterResults = (filteredCollabs) => { 101 + const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 102 + this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 103 + } 104 + clearResults() { 105 + this.results = []; 106 + this.resultsCache = []; 107 + } 108 + getLink(xwikiDocSpace) { 109 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 110 + } 111 + handleKeyPress(e) { 112 + if (e.keyCode === 13) { 113 + this.handleSearch(true); 114 + } 115 + } 56 56 render() { 57 57 return html` 58 58 <div> 59 59 <div> 60 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 61 - <button @click="${this.handleSearch}">Search</button> 120 + <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 121 + <button @click="${() => this.handleSearch(true)}">Search</button> 62 62 </div> 63 63 <div> 64 64 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> ... ... @@ -67,10 +67,10 @@ 67 67 </div> 68 68 <div> 69 69 ${this.results.map(result => html` 70 - <div> 71 - <a href="#">${result.title}</a> 72 - <div>${result.id}</div> 130 + <div class="result"> 131 + <a href="${this.getLink(result.space)}">${result.title_}</a> 73 73 <div>${result.doccontent_.substring(0, 150)} 133 + <div class="light">${result.space.replaceAll('.', ' / ')}</div> 74 74 </div> 75 75 `)} 76 76 </div> ... ... @@ -101,132 +101,5 @@ 101 101 } 102 102 }); 103 103 </script> 104 - 105 105 <clb-unified-search></clb-unified-search> 106 -<!-- 107 -<select id="context-search-type"> 108 - <option value="all">All</option> 109 - <option value="collabs">Collabs</option> 110 - <option value="current-collab">Current Collab</option> 111 -</select> 112 -<input type="text" id="context-search-text" /> 113 -<button id="context-search-button" class="btn btn-primary">Search</button> 114 -<div class="form-group"> 115 - <label> 116 - <input type="checkbox" data-role-filter="administrator"> Administrator 117 - </label> 118 - <label> 119 - <input type="checkbox" data-role-filter="editor"> Editor 120 - </label> 121 -</div> 122 - 123 - 124 -<pre id="context-search-response"></pre> 125 -<script> 126 - window.addEventListener('DOMContentLoaded', function() { 127 - const filters = { 128 - search: '', 129 - offset: 0, 130 - orderField: 'title', 131 - order: 'asc', 132 - favorite: false, 133 - roles: [] // to be joined as administrator+editor+viewer 134 - }; 135 - 136 - function addRole(role) { 137 - if(filters.roles.indexOf(role) == -1) { 138 - filters.roles.push(role); 139 - } 140 - } 141 - 142 - function removeRole(role) { 143 - filters.roles = filters.roles.filter(r => r !== role) 144 - } 145 - 146 - const filterInputs = document.querySelectorAll('input[data-role-filter]'); 147 - 148 - filterInputs.forEach(function(filterIpt) { 149 - filterIpt.addEventListener('click', function() { 150 - const role = this.getAttribute('data-role-filter'); 151 - if(this.checked) { 152 - addRole(role); 153 - } else { 154 - removeRole(role); 155 - } 156 - runFilteredRequest(); 157 - }) 158 - }); 159 - 160 - function runFilteredRequest() { 161 - const urlParams = new URLSearchParams(); 162 - const tmpFilters = filters; 163 - tmpFilters.roles = tmpFilters.roles.join("+"); 164 - for(filter in tmpFilters) { 165 - urlParams.set(filter, tmpFilters[filter]); 166 - } 167 - console.log(urlParams); 168 - } 169 - // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 170 - const contextSearchType = document.getElementById("context-search-type"); 171 - const contextSearchText = document.getElementById("context-search-text"); 172 - const contextSearchResponse = document.getElementById("context-search-response"); 173 - const contextSearchButton = document.getElementById("context-search-button"); 174 - contextSearchButton.addEventListener('click', function() { 175 - const context = contextSearchType.options[contextSearchType.selectedIndex].value; 176 - const term = contextSearchText.value; 177 - switch(context) { 178 - case 'collabs': 179 - document.location.href = `/bin/view/Collabs/#search=${term}`; 180 - break; 181 - case 'current-collab': 182 - handleXWikiSearch('bougaultx'); 183 - break 184 - default: 185 - handleXWikiSearch('') 186 - } 187 - 188 - }); 189 - function handleXWikiSearch(space, callback) { 190 - require(['jquery'], function($) { 191 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 192 - const contextSearchButton = document.getElementById("context-search-button"); 193 - const xwikiSpace = space ? `.${space}` : ''; 194 - contextSearchButton.addEventListener('click', function() { 195 - $.post(solrServiceURL, { 196 - outputSyntax: 'plain', 197 - media: 'json', 198 - query: [ 199 - 'q="__INPUT__"~100', 200 - 'fq=type:DOCUMENT', 201 - `fq=space:Collabs${xwikiSpace}.*` 202 - ].join('\n'), 203 - input: $('#context-search-text').val() 204 - }).then(res => { 205 - if(callback) { 206 - callback(res).then(results => { 207 - contextSearchResponse.innerText = JSON.stringify(results, null, 2); 208 - }) 209 - } else { 210 - contextSearchResponse.innerText = JSON.stringify(res, null, 2); 211 - } 212 - }); 213 - }); 214 - }); 215 - } 216 - function applyAdministratorFilter(results) { 217 - return new Promise((resolve, reject) => { 218 - //fetch("/rest/v1/collabs?roles=administrator") 219 - fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 220 - .then(res => res.json()) 221 - .then(collabs => { 222 - const spaces = collabs.map(collab => `Collabs.${collab.name}`); 223 - const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 224 - resolve(filtered); 225 - }) 226 - 227 - }) 228 - } 229 -}); 230 -</script> 231 ---> 232 232 {{/html}}