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