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