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,190 +1,143 @@ 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() { 9 - 3 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 10 10 class UnifiedSearch extends LitElement { 11 - static properties = { 12 - results: { type: Array }, 13 - resultsCache: { type: Array }, 14 - collabFiltersResults: { type: Array} 5 + render() { 6 + return html`<div> 7 + <input type="text" placeholder="Search..." /> 8 + <button>Search</button> 9 +</div>` 15 15 } 16 - static styles = css` 17 - :host > div { 18 - padding-bottom: 4em; 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); 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 - .rawResults { 31 - width: 100%; 32 - display: flex; 33 - font-size: 12px; 34 - margin-top: 2em; 35 - } 36 - .rawResults pre { 37 - overflow: scroll; 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 = []; 51 - this.collabFiltersResults = []; 52 52 } 53 - firstUpdated() { 54 - this.renderRoot.getElementById('searchInput').focus(); 51 + 52 + function removeRole(role) { 53 + filters.roles = filters.roles.filter(r => r !== role) 55 55 } 56 - toggleRoleFilter(roleName) { 57 - if(this.rolesFilter.indexOf(roleName) === -1) { 58 - this.rolesFilter.push(roleName); 59 - } else { 60 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 61 - } 62 - this[roleName] = !this[roleName]; 63 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 64 - this.handleSearch(); 65 - } 66 - setSearchText(e) { 67 - this.searchText = e.target.value; 68 - } 69 - handleSearch(textSearch) { 70 - if(this.searchText !== "" || textSearch) { 71 - if(this.searchText !== this.prevSearchText) { 72 - this.clearResults(); 73 - this.prevSearchText = this.searchText; 74 - this.fetchWikiSearch().then(results => { 75 - this.resultsCache = results; 76 - if(this.hasActiveFilters()) { 77 - this.fetchFilterSearch().then(this.filterResults); 78 - } else { 79 - this.results = results; 80 - } 81 - }) 82 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 83 - this.fetchFilterSearch().then(this.filterResults) 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); 84 84 } else { 85 - this.results = this.resultsCache;64 + removeRole(role); 86 86 } 87 - } else { 88 - this.clearResults(); 89 - console.log("no search text, should return filter search results if any"); 90 - this.fetchFilterSearch().then(collabs => { 91 - console.log("Format and display collabs", collabs); 92 - }) 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]); 93 93 } 77 + console.log(urlParams); 94 94 } 95 - hasActiveFilters() { 96 - // we only look at role filters for POC. 97 - return this.rolesFilter.length > 0; 98 - } 99 - fetchWikiSearch() { 100 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 101 - return handleXWikiSearch(this.searchText); 102 - } 103 - fetchFilterSearch() { 104 - return new Promise((resolve) => { 105 - if(this.hasActiveFilters()) { 106 - fetch(this.filterUrl).then(res => res.json()).then((res) => { 107 - this.collabFiltersResults = res; 108 - resolve(res); 109 - }); 110 - } else { 111 - resolve([]); 112 - } 113 - }); 114 - } 115 - filterResults = (filteredCollabs) => { 116 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 117 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 118 - } 119 - clearResults() { 120 - this.results = []; 121 - this.resultsCache = []; 122 - } 123 - getLink(xwikiDocSpace) { 124 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 125 - } 126 - handleKeyPress(e) { 127 - if (e.keyCode === 13) { 128 - this.handleSearch(true); 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('') 129 129 } 130 - } 131 - render() { 132 - return html` 133 -<div> 134 - <div> 135 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 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 - <div class="rawResults"> 153 - <div> 154 - <strong>XWiki Search Results</strong> 155 - <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> 156 - </div> 157 - <div> 158 - <strong>Collab Search Results (Filters)</strong> 159 - <pre>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</pre> 160 - </div> 161 - </div> 162 -</div> 163 -` 164 - } 165 - } 166 - customElements.define('clb-unified-search', UnifiedSearch); 167 167 168 - functionhandleXWikiSearch(searchString){169 - return new Promise((resolve)=>{98 + }); 99 + function handleXWikiSearch(space, callback) { 170 170 require(['jquery'], function($) { 171 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 172 - //contextSearchButton.addEventListener('click', 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() { 173 173 $.post(solrServiceURL, { 174 - outputSyntax: 'plain', 175 - media: 'json', 176 - query: [ 177 - 'q="__INPUT__"~100', 178 - 'fq=type:DOCUMENT', 179 - `fq=space:Collabs.*` 180 - ].join('\n'), 181 - input: searchString 182 - }).then(resolve); 183 - //}); 184 - }); 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 + }); 185 185 }); 186 186 } 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 + } 187 187 }); 140 + 141 + 188 188 </script> 189 -<clb-unified-search></clb-unified-search> 190 190 {{/html}}