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,180 +1,133 @@ 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 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() {3 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 4 +</script> 9 9 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; 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); 19 19 } 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 42 } 43 - firstUpdated() { 44 - this.renderRoot.getElementById('searchInput').focus(); 41 + 42 + function removeRole(role) { 43 + filters.roles = filters.roles.filter(r => r !== role) 45 45 } 46 - toggleRoleFilter(roleName) { 47 - if(this.rolesFilter.indexOf(roleName) === -1) { 48 - this.rolesFilter.push(roleName); 49 - } else { 50 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 51 - } 52 - this[roleName] = !this[roleName]; 53 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 54 - this.handleSearch(); 55 - } 56 - setSearchText(e) { 57 - this.searchText = e.target.value; 58 - } 59 - handleSearch(textSearch) { 60 - if(this.searchText !== "" || textSearch) { 61 - if(this.searchText !== this.prevSearchText) { 62 - this.clearResults(); 63 - this.prevSearchText = this.searchText; 64 - this.fetchWikiSearch().then(results => { 65 - this.resultsCache = results; 66 - if(this.hasActiveFilters()) { 67 - this.fetchFilterSearch().then(this.filterResults); 68 - } else { 69 - this.results = results; 70 - } 71 - }) 72 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 73 - this.fetchFilterSearch().then(this.filterResults) 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); 74 74 } else { 75 - this.results = this.resultsCache;54 + removeRole(role); 76 76 } 77 - } else { 78 - this.clearResults(); 79 - console.log("no search text, should return filter search results if any"); 80 - this.fetchFilterSearch().then(collabs => { 81 - console.log("Format and display collabs", collabs); 82 - }) 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]); 83 83 } 67 + console.log(urlParams); 84 84 } 85 - hasActiveFilters() { 86 - // we only look at role filters for POC. 87 - return this.rolesFilter.length > 0; 88 - } 89 - fetchWikiSearch() { 90 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 91 - return handleXWikiSearch(this.searchText); 92 - } 93 - fetchFilterSearch() { 94 - return new Promise((resolve) => { 95 - if(this.hasActiveFilters()) { 96 - fetch(this.filterUrl).then(res => res.json()).then((res) => { 97 - this.collabFiltersResults = res; 98 - resolve(res); 99 - }); 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 - handleKeyPress(e) { 117 - if (e.keyCode === 13) { 118 - this.handleSearch(true); 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('') 119 119 } 120 - } 121 - render() { 122 - return html` 123 -<div> 124 - <div> 125 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 126 - <button @click="${() => this.handleSearch(true)}">Search</button> 127 - </div> 128 - <div> 129 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 130 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 131 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 132 - </div> 133 - <div> 134 - ${this.results.map(result => html` 135 - <div class="result"> 136 - <a href="${this.getLink(result.space)}">${result.title_}</a> 137 - <div>${result.doccontent_.substring(0, 150)} 138 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 139 - </div> 140 - `)} 141 - </div> 142 - <div class="rawResults"> 143 - <div> 144 - <strong>XWiki Search Results</strong> 145 - <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre> 146 - </div> 147 - <div> 148 - <strong>Collab Search Results (Filters)</strong> 149 - <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre> 150 - </div> 151 - </div> 152 -</div> 153 -` 154 - } 155 - } 156 - customElements.define('clb-unified-search', UnifiedSearch); 157 157 158 - functionhandleXWikiSearch(searchString){159 - return new Promise((resolve)=>{88 + }); 89 + function handleXWikiSearch(space, callback) { 160 160 require(['jquery'], function($) { 161 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 162 - //contextSearchButton.addEventListener('click', 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() { 163 163 $.post(solrServiceURL, { 164 - outputSyntax: 'plain', 165 - media: 'json', 166 - query: [ 167 - 'q="__INPUT__"~100', 168 - 'fq=type:DOCUMENT', 169 - `fq=space:Collabs.*` 170 - ].join('\n'), 171 - input: searchString 172 - }).then(resolve); 173 - //}); 174 - }); 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 + }); 175 175 }); 176 176 } 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 + } 177 177 }); 130 + 131 + 178 178 </script> 179 -<clb-unified-search></clb-unified-search> 180 180 {{/html}}