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