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