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