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