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