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