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