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