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,7 +1,6 @@ 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 7 import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; ... ... @@ -23,9 +23,6 @@ 23 23 results: { type: Array } 24 24 } 25 25 static styles = css` 26 - :host > div { 27 - padding-bottom: 4em; 28 - } 29 29 .result { 30 30 margin-top: 1em; 31 31 } ... ... @@ -40,94 +40,47 @@ 40 40 constructor() { 41 41 super(); 42 42 this.searchText = ""; 43 - this.prevSearchText = ""; 44 44 this.administrator = false; 45 45 this.editor = false; 46 46 this.viewer = false; 47 47 this.rolesFilter = []; 48 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc& limit=10000&favorite=false&roles=`);43 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`); 49 49 this.results = []; 50 - this.resultsCache = []; 51 51 } 52 52 toggleRoleFilter(roleName) { 53 - if(this.rolesFilter.indexOf(roleName) == =-1) {47 + if(this.rolesFilter.indexOf(roleName) == -1) { 54 54 this.rolesFilter.push(roleName); 55 55 } else { 56 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);50 + this.rolesFilter.filter(role => role !== roleName); 57 57 } 58 58 this[roleName] = !this[roleName]; 59 59 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 60 - this.handleSearch(); 61 61 } 62 62 setSearchText(e) { 63 63 this.searchText = e.target.value; 64 64 } 65 - handleSearch(textSearch) { 66 - if(this.searchText !== "" || textSearch) { 67 - if(this.searchText !== this.prevSearchText) { 68 - this.clearResults(); 69 - this.prevSearchText = this.searchText; 70 - this.fetchWikiSearch().then(results => { 71 - this.resultsCache = results; 72 - if(this.hasActiveFilters()) { 73 - this.fetchFilterSearch().then(this.filterResults); 74 - } else { 75 - this.results = results; 76 - } 77 - }) 78 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 79 - this.fetchFilterSearch().then(this.filterResults) 80 - } else { 81 - this.results = this.resultsCache; 82 - } 83 - } else { 84 - this.clearResults(); 85 - console.log("no search text, should return filter search results if any"); 86 - this.fetchFilterSearch().then(collabs => { 87 - console.log("Format and display collabs", collabs); 88 - }) 58 + handleSearch() { 59 + console.log(this.searchText); 60 + if(this.searchText !== "") { 61 + this.fetchWikiSearch(); 89 89 } 90 90 } 91 - hasActiveFilters() { 92 - // we only look at role filters for POC. 93 - return this.rolesFilter.length > 0; 94 - } 95 95 fetchWikiSearch() { 96 96 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 97 - returnhandleXWikiSearch(this.searchText);66 + handleXWikiSearch(this.searchText).then(results => this.results = results); 98 98 } 99 - fetchFilterSearch() { 100 - return new Promise((resolve) => { 101 - if(this.hasActiveFilters()) { 102 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 103 - } else { 104 - resolve([]); 105 - } 106 - }); 68 + buildFilter() { 69 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 107 107 } 108 - filterResults = (filteredCollabs) => { 109 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 110 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 111 - } 112 - clearResults() { 113 - this.results = []; 114 - this.resultsCache = []; 115 - } 116 116 getLink(xwikiDocSpace) { 117 117 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 118 118 } 119 - handleKeyPress(e) { 120 - console.log(e); 121 - if (e.keyCode === 13) { 122 - this.handleSearch(true); 123 - } 124 - } 125 125 render() { 126 126 return html` 127 127 <div> 128 128 <div> 129 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}"/>130 - <button @click="${ () =>this.handleSearch(true)}">Search</button>78 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 79 + <button @click="${this.handleSearch}">Search</button> 131 131 </div> 132 132 <div> 133 133 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> ... ... @@ -138,8 +138,8 @@ 138 138 ${this.results.map(result => html` 139 139 <div class="result"> 140 140 <a href="${this.getLink(result.space)}">${result.title_}</a> 90 + <div class="light">${result.space}</div> 141 141 <div>${result.doccontent_.substring(0, 150)} 142 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 143 143 </div> 144 144 `)} 145 145 </div> ... ... @@ -172,5 +172,130 @@ 172 172 </script> 173 173 174 174 <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> 175 175 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 +--> 176 176 {{/html}}