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,177 +1,152 @@ 1 - 2 -{{html clean="false"}}<!-- 3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 - !!! Many optimisations can be done !!! 5 ---> 1 +{{html clean="false"}} 6 6 <script type="module"> 7 -import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 8 -window.addEventListener('DOMContentLoaded', function() { 9 - 3 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 10 10 class UnifiedSearch extends LitElement { 11 11 static properties = { 12 - results: { type: Array }, 13 - resultsCache: { type: Array }, 14 - collabFiltersResults: { type: Array} 6 + searchText: { type: String } 15 15 } 16 - static styles = css` 17 - :host > div { 18 - padding-bottom: 4em; 19 - } 20 - .result { 21 - margin-top: 1em; 22 - } 23 - .light { 24 - color: var(--color-gray-500, #CCC); 25 - font-size: 14px; 26 - } 27 - a { 28 - color: var(--color-brand-primary, blue); 29 - } 30 - `; 31 - constructor() { 32 - super(); 33 - this.searchText = ""; 34 - this.prevSearchText = ""; 35 - this.administrator = false; 36 - this.editor = false; 37 - this.viewer = false; 38 - this.rolesFilter = []; 39 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 40 - this.results = []; 41 - this.resultsCache = []; 42 - this.offset = 0; 43 - this.nb = 10; 44 - } 45 - firstUpdated() { 46 - this.renderRoot.getElementById('searchInput').focus(); 47 - } 48 - toggleRoleFilter(roleName) { 49 - if(this.rolesFilter.indexOf(roleName) === -1) { 50 - this.rolesFilter.push(roleName); 51 - } else { 52 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 53 - } 54 - this[roleName] = !this[roleName]; 55 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 56 - this.handleSearch(); 57 - } 58 58 setSearchText(e) { 59 59 this.searchText = e.target.value; 60 60 } 61 - setOffset(e) {62 - this. offset = e.target.value;11 + handleSearch() { 12 + console.log(this.searchText); 63 63 } 64 - setNb(e) { 65 - this.nb = e.target.value; 14 + render() { 15 + return html`<div> 16 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 17 + <button @click="${this.handleSearch}">Search</button> 18 +</div>` 66 66 } 67 - handleSearch(textSearch) { 68 - if(this.searchText !== "" || textSearch) { 69 - if(this.searchText !== this.prevSearchText) { 70 - this.clearResults(); 71 - this.prevSearchText = this.searchText; 72 - this.fetchWikiSearch().then(results => { 73 - this.resultsCache = results; 74 - if(this.hasActiveFilters()) { 75 - this.fetchFilterSearch().then(this.filterResults); 76 - } else { 77 - this.results = results; 78 - } 79 - }) 80 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 81 - this.fetchFilterSearch().then(this.filterResults) 82 - } else { 83 - this.results = this.resultsCache; 84 - } 85 - } else { 86 - this.clearResults(); 87 - console.log("no search text, should return filter search results if any"); 88 - this.fetchFilterSearch().then(collabs => { 89 - console.log("Format and display collabs", collabs); 90 - }) 20 + } 21 + customElements.define('clb-unified-search', UnifiedSearch); 22 +</script> 23 + 24 +<clb-unified-search></clb-unified-search> 25 + 26 +<select id="context-search-type"> 27 + <option value="all">All</option> 28 + <option value="collabs">Collabs</option> 29 + <option value="current-collab">Current Collab</option> 30 +</select> 31 +<input type="text" id="context-search-text" /> 32 +<button id="context-search-button" class="btn btn-primary">Search</button> 33 +<div class="form-group"> 34 + <label> 35 + <input type="checkbox" data-role-filter="administrator"> Administrator 36 + </label> 37 + <label> 38 + <input type="checkbox" data-role-filter="editor"> Editor 39 + </label> 40 +</div> 41 + 42 + 43 +<pre id="context-search-response"></pre> 44 +<script> 45 + window.addEventListener('DOMContentLoaded', function() { 46 + const filters = { 47 + search: '', 48 + offset: 0, 49 + orderField: 'title', 50 + order: 'asc', 51 + favorite: false, 52 + roles: [] // to be joined as administrator+editor+viewer 53 + }; 54 + 55 + function addRole(role) { 56 + if(filters.roles.indexOf(role) == -1) { 57 + filters.roles.push(role); 91 91 } 92 92 } 93 - hasActiveFilters() {94 - // weonlylook atrolefilters forPOC.95 - return this.rolesFilter.length>0;60 + 61 + function removeRole(role) { 62 + filters.roles = filters.roles.filter(r => r !== role) 96 96 } 97 - fetchWikiSearch() {98 - // requestshould be builtfrom component,notfrom"external" dependency. Leave itherelikethisforPOC.99 - return handleXWikiSearch(this.searchText, this.offset, this.nb);100 - }101 - f etchFilterSearch() {102 - returnnewPromise((resolve)=> {103 - if(this.h asActiveFilters()){104 - fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));64 + 65 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 66 + 67 + filterInputs.forEach(function(filterIpt) { 68 + filterIpt.addEventListener('click', function() { 69 + const role = this.getAttribute('data-role-filter'); 70 + if(this.checked) { 71 + addRole(role); 105 105 } else { 106 - re solve([]);73 + removeRole(role); 107 107 } 108 - }); 109 - } 110 - filterResults = (filteredCollabs) => { 111 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 112 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 113 - } 114 - clearResults() { 115 - this.results = []; 116 - this.resultsCache = []; 117 - } 118 - getLink(xwikiDocSpace) { 119 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 120 - } 121 - handleKeyPress(e) { 122 - if (e.keyCode === 13) { 123 - this.handleSearch(true); 75 + runFilteredRequest(); 76 + }) 77 + }); 78 + 79 + function runFilteredRequest() { 80 + const urlParams = new URLSearchParams(); 81 + const tmpFilters = filters; 82 + tmpFilters.roles = tmpFilters.roles.join("+"); 83 + for(filter in tmpFilters) { 84 + urlParams.set(filter, tmpFilters[filter]); 124 124 } 86 + console.log(urlParams); 125 125 } 126 - render() { 127 - return html` 128 -<div> 129 - <div> 130 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 131 - <input @change="${this.setNb}"" type="text" value="${this.nb}" /> 132 - <input @change="${this.setOffset}"" type="text" value="${this.offset}" /> 133 - <button @click="${() => this.handleSearch(true)}">Search</button> 134 - </div> 135 - <div> 136 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 137 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 138 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 139 - </div> 140 - <div> 141 - ${this.results.map(result => html` 142 - <div class="result"> 143 - <a href="${this.getLink(result.space)}">${result.title_}</a> 144 - <div>${result.doccontent_.substring(0, 150)} 145 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 146 - </div> 147 - `)} 148 - </div> 149 -` 150 - } 151 - } 152 - customElements.define('clb-unified-search', UnifiedSearch); 88 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 89 + const contextSearchType = document.getElementById("context-search-type"); 90 + const contextSearchText = document.getElementById("context-search-text"); 91 + const contextSearchResponse = document.getElementById("context-search-response"); 92 + const contextSearchButton = document.getElementById("context-search-button"); 93 + contextSearchButton.addEventListener('click', function() { 94 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 95 + const term = contextSearchText.value; 96 + switch(context) { 97 + case 'collabs': 98 + document.location.href = `/bin/view/Collabs/#search=${term}`; 99 + break; 100 + case 'current-collab': 101 + handleXWikiSearch('bougaultx'); 102 + break 103 + default: 104 + handleXWikiSearch('') 105 + } 153 153 154 - functionhandleXWikiSearch(searchString){155 - return new Promise((resolve)=>{107 + }); 108 + function handleXWikiSearch(space, callback) { 156 156 require(['jquery'], function($) { 157 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 158 - //contextSearchButton.addEventListener('click', function() { 159 - $.get(solrServiceURL, { 160 - outputSyntax: 'plain', 161 - media: 'json', 162 - nb:100, 163 - offset:10, 164 - query: [ 165 - 'q="__INPUT__"~100', 166 - 'fq=type:DOCUMENT', 167 - `fq=space:Collabs.*` 168 - ].join('\n'), 169 - input: searchString 170 - }).then(resolve); 171 - //}); 172 - }); 110 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 111 + const contextSearchButton = document.getElementById("context-search-button"); 112 + const xwikiSpace = space ? `.${space}` : ''; 113 + contextSearchButton.addEventListener('click', function() { 114 + $.post(solrServiceURL, { 115 + outputSyntax: 'plain', 116 + media: 'json', 117 + query: [ 118 + 'q="__INPUT__"~100', 119 + 'fq=type:DOCUMENT', 120 + `fq=space:Collabs${xwikiSpace}.*` 121 + ].join('\n'), 122 + input: $('#context-search-text').val() 123 + }).then(res => { 124 + if(callback) { 125 + callback(res).then(results => { 126 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 127 + }) 128 + } else { 129 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 130 + } 131 + }); 132 + }); 173 173 }); 174 174 } 135 + function applyAdministratorFilter(results) { 136 + return new Promise((resolve, reject) => { 137 + //fetch("/rest/v1/collabs?roles=administrator") 138 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 139 + .then(res => res.json()) 140 + .then(collabs => { 141 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 142 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 143 + resolve(filtered); 144 + }) 145 + 146 + }) 147 + } 175 175 }); 149 + 150 + 176 176 </script> 177 - <clb-unified-search></clb-unified-search>{{/html}}152 +{{/html}}