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,152 +1,165 @@ 1 1 {{html clean="false"}} 2 +<!-- 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'; 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 + 4 4 class UnifiedSearch extends LitElement { 5 5 static properties = { 6 - searchText: { type:String}12 + results: { type: Array } 7 7 } 8 - setSearchText(e) { 9 - this.searchText = e.target.value; 14 + static styles = css` 15 + :host > div { 16 + padding-bottom: 4em; 17 + } 18 + .result { 19 + margin-top: 1em; 20 + } 21 + .light { 22 + color: var(--color-gray-500, #CCC); 23 + font-size: 14px; 24 + } 25 + a { 26 + color: var(--color-brand-primary, blue); 27 + } 28 + `; 29 + constructor() { 30 + super(); 31 + this.searchText = ""; 32 + this.prevSearchText = ""; 33 + this.administrator = false; 34 + this.editor = false; 35 + this.viewer = false; 36 + this.rolesFilter = []; 37 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 38 + this.results = []; 39 + this.resultsCache = []; 10 10 } 11 - handleSearch() {12 - console.log(this.searchText);41 + firstUpdated() { 42 + this.renderRoot.getElementById('searchInput').focus(); 13 13 } 14 - render() { 15 - return html`<div> 16 - <input @change="${setSearchText}" type="text" placeholder="Search..." /> 17 - <button @click="${handleSearch}">Search</button> 18 -</div>` 19 - } 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); 44 + toggleRoleFilter(roleName) { 45 + if(this.rolesFilter.indexOf(roleName) === -1) { 46 + this.rolesFilter.push(roleName); 47 + } else { 48 + this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 58 58 } 50 + this[roleName] = !this[roleName]; 51 + this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 52 + this.handleSearch(); 59 59 } 60 - 61 - function removeRole(role) { 62 - filters.roles = filters.roles.filter(r => r !== role) 54 + setSearchText(e) { 55 + this.searchText = e.target.value; 63 63 } 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); 57 + handleSearch(textSearch) { 58 + if(this.searchText !== "" || textSearch) { 59 + if(this.searchText !== this.prevSearchText) { 60 + this.clearResults(); 61 + this.prevSearchText = this.searchText; 62 + this.fetchWikiSearch().then(results => { 63 + this.resultsCache = results; 64 + if(this.hasActiveFilters()) { 65 + this.fetchFilterSearch().then(this.filterResults); 66 + } else { 67 + this.results = results; 68 + } 69 + }) 70 + } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 71 + this.fetchFilterSearch().then(this.filterResults) 72 72 } else { 73 - re moveRole(role);73 + this.results = this.resultsCache; 74 74 } 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]); 75 + } else { 76 + this.clearResults(); 77 + console.log("no search text, should return filter search results if any"); 78 + this.fetchFilterSearch().then(collabs => { 79 + console.log("Format and display collabs", collabs); 80 + }) 85 85 } 86 - console.log(urlParams); 87 87 } 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('') 83 + hasActiveFilters() { 84 + // we only look at role filters for POC. 85 + return this.rolesFilter.length > 0; 86 + } 87 + fetchWikiSearch() { 88 + // request should be built from component, not from "external" dependency. Leave it here like this for POC. 89 + return handleXWikiSearch(this.searchText); 90 + } 91 + fetchFilterSearch() { 92 + return new Promise((resolve) => { 93 + if(this.hasActiveFilters()) { 94 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 95 + } else { 96 + resolve([]); 97 + } 98 + }); 99 + } 100 + filterResults = (filteredCollabs) => { 101 + const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 102 + this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 103 + } 104 + clearResults() { 105 + this.results = []; 106 + this.resultsCache = []; 107 + } 108 + getLink(xwikiDocSpace) { 109 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 110 + } 111 + handleKeyPress(e) { 112 + if (e.keyCode === 13) { 113 + this.handleSearch(true); 105 105 } 115 + } 116 + render() { 117 + return html` 118 +<div> 119 + <div> 120 + <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 121 + <button @click="${() => this.handleSearch(true)}">Search</button> 122 + </div> 123 + <div> 124 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 125 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 126 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 127 + </div> 128 + <div> 129 + ${this.results.map(result => html` 130 + <div class="result"> 131 + <a href="${this.getLink(result.space)}">${result.title_}</a> 132 + <div>${result.doccontent_.substring(0, 150)} 133 + <div class="light">${result.space.replaceAll('.', ' / ')}</div> 134 + </div> 135 + `)} 136 + </div> 137 +</div> 138 +` 139 + } 140 + } 141 + customElements.define('clb-unified-search', UnifiedSearch); 106 106 107 - });108 - functionhandleXWikiSearch(space, callback) {143 + function handleXWikiSearch(searchString) { 144 + return new Promise((resolve) => { 109 109 require(['jquery'], function($) { 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() { 146 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 147 + //contextSearchButton.addEventListener('click', function() { 114 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 - }); 149 + outputSyntax: 'plain', 150 + media: 'json', 151 + query: [ 152 + 'q="__INPUT__"~100', 153 + 'fq=type:DOCUMENT', 154 + `fq=space:Collabs.*` 155 + ].join('\n'), 156 + input: searchString 157 + }).then(resolve); 158 + //}); 159 + }); 133 133 }); 134 134 } 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 - } 148 148 }); 149 - 150 - 151 151 </script> 164 +<clb-unified-search></clb-unified-search> 152 152 {{/html}}