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,109 @@ 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} 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 + constructor() { 22 + super(); 23 + this.searchText = ""; 24 + this.administrator = false; 25 + this.editor = false; 26 + this.viewer = false; 27 + this.rolesFilter = []; 28 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`); 29 + this.results = []; 30 + } 31 + toggleRoleFilter(roleName) { 32 + if(this.rolesFilter.indexOf(roleName) == -1) { 33 + this.rolesFilter.push(roleName); 34 + } else { 35 + this.rolesFilter.filter(role => role !== roleName); 36 + } 37 + this[roleName] = !this[roleName]; 38 + this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 39 + } 40 + setSearchText(e) { 41 + this.searchText = e.target.value; 42 + } 43 + handleSearch() { 44 + console.log(this.searchText); 45 + if(this.searchText !== "") { 46 + this.fetchWikiSearch(); 47 + } 48 + } 49 + fetchWikiSearch() { 50 + // request should be built from component, not from "external" dependency. Leave it here like this for POC. 51 + handleXWikiSearch(this.searchText).then(results => this.results = results); 52 + } 53 + buildFilter() { 54 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 55 + } 56 + render() { 57 + return html` 58 +<div> 59 + <div> 60 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 61 + <button @click="${this.handleSearch}">Search</button> 62 + </div> 63 + <div> 64 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 65 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 66 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 67 + </div> 68 + <div> 69 + ${this.results.map(result => html` 70 + <div> 71 + <a href="#">${result.title}</a> 72 + <div>${result.id}</div> 73 + <div>${result.doccontent_.substring(0, 150)} 74 + </div> 75 + `)} 76 + </div> 77 +</div> 78 +` 79 + } 80 + } 81 + customElements.define('clb-unified-search', UnifiedSearch); 82 + 83 + function handleXWikiSearch(searchString) { 84 + return new Promise((resolve) => { 85 + require(['jquery'], function($) { 86 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 87 + //contextSearchButton.addEventListener('click', function() { 88 + $.post(solrServiceURL, { 89 + outputSyntax: 'plain', 90 + media: 'json', 91 + query: [ 92 + 'q="__INPUT__"~100', 93 + 'fq=type:DOCUMENT', 94 + `fq=space:Collabs.*` 95 + ].join('\n'), 96 + input: searchString 97 + }).then(resolve); 98 + //}); 99 + }); 100 + }); 101 + } 102 +}); 103 +</script> 104 + 105 +<clb-unified-search></clb-unified-search> 106 +<!-- 3 3 <select id="context-search-type"> 4 4 <option value="all">All</option> 5 5 <option value="collabs">Collabs</option> ... ... @@ -7,22 +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> 114 +<div class="form-group"> 115 + <label> 116 + <input type="checkbox" data-role-filter="administrator"> Administrator 117 + </label> 118 + <label> 119 + <input type="checkbox" data-role-filter="editor"> Editor 120 + </label> 121 +</div> 10 10 123 + 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 - */ 25 25 window.addEventListener('DOMContentLoaded', function() { 127 + const filters = { 128 + search: '', 129 + offset: 0, 130 + orderField: 'title', 131 + order: 'asc', 132 + favorite: false, 133 + roles: [] // to be joined as administrator+editor+viewer 134 + }; 135 + 136 + function addRole(role) { 137 + if(filters.roles.indexOf(role) == -1) { 138 + filters.roles.push(role); 139 + } 140 + } 141 + 142 + function removeRole(role) { 143 + filters.roles = filters.roles.filter(r => r !== role) 144 + } 145 + 146 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 147 + 148 + filterInputs.forEach(function(filterIpt) { 149 + filterIpt.addEventListener('click', function() { 150 + const role = this.getAttribute('data-role-filter'); 151 + if(this.checked) { 152 + addRole(role); 153 + } else { 154 + removeRole(role); 155 + } 156 + runFilteredRequest(); 157 + }) 158 + }); 159 + 160 + function runFilteredRequest() { 161 + const urlParams = new URLSearchParams(); 162 + const tmpFilters = filters; 163 + tmpFilters.roles = tmpFilters.roles.join("+"); 164 + for(filter in tmpFilters) { 165 + urlParams.set(filter, tmpFilters[filter]); 166 + } 167 + console.log(urlParams); 168 + } 169 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 26 26 const contextSearchType = document.getElementById("context-search-type"); 27 27 const contextSearchText = document.getElementById("context-search-text"); 28 28 const contextSearchResponse = document.getElementById("context-search-response"); ... ... @@ -35,35 +35,54 @@ 35 35 document.location.href = `/bin/view/Collabs/#search=${term}`; 36 36 break; 37 37 case 'current-collab': 38 - fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results); 39 - //handleXWikiSearch('bougaultx'); 182 + handleXWikiSearch('bougaultx'); 40 40 break 41 41 default: 42 - handleXWikiSearch() 43 - //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results); 185 + handleXWikiSearch('') 44 44 } 45 45 46 46 }); 47 - }); 48 - 49 -function handleXWikiSearch(space) { 50 - require(['jquery'], function($) { 51 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 52 - const contextSearchButton = document.getElementById("context-search-button"); 53 - const xwikiSpace = space ? `.${space}` : ''; 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${xwikiSpace}.*` 62 - ].join('\n'), 63 - input: $('#context-search-text').val() 64 - }); 189 + function handleXWikiSearch(space, callback) { 190 + require(['jquery'], function($) { 191 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 192 + const contextSearchButton = document.getElementById("context-search-button"); 193 + const xwikiSpace = space ? `.${space}` : ''; 194 + contextSearchButton.addEventListener('click', function() { 195 + $.post(solrServiceURL, { 196 + outputSyntax: 'plain', 197 + media: 'json', 198 + query: [ 199 + 'q="__INPUT__"~100', 200 + 'fq=type:DOCUMENT', 201 + `fq=space:Collabs${xwikiSpace}.*` 202 + ].join('\n'), 203 + input: $('#context-search-text').val() 204 + }).then(res => { 205 + if(callback) { 206 + callback(res).then(results => { 207 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 208 + }) 209 + } else { 210 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 211 + } 212 + }); 213 + }); 65 65 }); 66 - }); 67 -} 215 + } 216 + function applyAdministratorFilter(results) { 217 + return new Promise((resolve, reject) => { 218 + //fetch("/rest/v1/collabs?roles=administrator") 219 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 220 + .then(res => res.json()) 221 + .then(collabs => { 222 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 223 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 224 + resolve(filtered); 225 + }) 226 + 227 + }) 228 + } 229 +}); 68 68 </script> 231 +--> 69 69 {{/html}}