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,196 +1,152 @@ 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 11 static properties = { 12 - results: { type: Array }, 13 - resultsCache: { type: Array }, 14 - collabFiltersResults: { type: Array} 6 + searchText: { type: String } 15 15 } 16 - static styles = css` 17 - :host > div { 18 - padding-bottom: 4em; 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 > div { 37 - width: 100%; 38 - } 39 - .rawResults ul { 40 - list-style-type: none; 41 - padding: 0; 42 - } 43 - `; 44 - constructor() { 45 - super(); 46 - this.searchText = ""; 47 - this.prevSearchText = ""; 48 - this.administrator = false; 49 - this.editor = false; 50 - this.viewer = false; 51 - this.rolesFilter = []; 52 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 53 - this.results = []; 54 - this.resultsCache = []; 55 - this.collabFiltersResults = []; 56 - } 57 - firstUpdated() { 58 - this.renderRoot.getElementById('searchInput').focus(); 59 - } 60 - toggleRoleFilter(roleName) { 61 - if(this.rolesFilter.indexOf(roleName) === -1) { 62 - this.rolesFilter.push(roleName); 63 - } else { 64 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 65 - } 66 - this[roleName] = !this[roleName]; 67 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 68 - this.handleSearch(); 69 - } 70 70 setSearchText(e) { 71 71 this.searchText = e.target.value; 72 72 } 73 - handleSearch(textSearch) { 74 - if(this.searchText !== "" || textSearch) { 75 - if(this.searchText !== this.prevSearchText) { 76 - this.clearResults(); 77 - this.prevSearchText = this.searchText; 78 - this.fetchWikiSearch().then(results => { 79 - this.resultsCache = results; 80 - if(this.hasActiveFilters()) { 81 - this.fetchFilterSearch().then(this.filterResults); 82 - } else { 83 - this.results = results; 84 - } 85 - }) 86 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 87 - this.fetchFilterSearch().then(this.filterResults) 88 - } else { 89 - this.results = this.resultsCache; 90 - } 91 - } else { 92 - this.clearResults(); 93 - console.log("no search text, should return filter search results if any"); 94 - this.fetchFilterSearch().then(collabs => { 95 - console.log("Format and display collabs", collabs); 96 - }) 97 - } 11 + handleSearch() { 12 + console.log(this.searchText); 98 98 } 99 - hasActiveFilters() { 100 - // we only look at role filters for POC. 101 - return this.rolesFilter.length > 0; 14 + render() { 15 + return html`<div> 16 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 17 + <button @click="${this.handleSearch}">Search</button> 18 +</div>` 102 102 } 103 - fetchWikiSearch() { 104 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 105 - return handleXWikiSearch(this.searchText); 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); 58 + } 106 106 } 107 - fetchFilterSearch() { 108 - return new Promise((resolve) => { 109 - if(this.hasActiveFilters()) { 110 - fetch(this.filterUrl).then(res => res.json()).then((res) => { 111 - this.collabFiltersResults = res; 112 - resolve(res); 113 - }); 60 + 61 + function removeRole(role) { 62 + filters.roles = filters.roles.filter(r => r !== role) 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); 114 114 } else { 115 - this.collabFiltersResults = res; 116 - resolve([]); 73 + removeRole(role); 117 117 } 118 - }); 119 - } 120 - filterResults = (filteredCollabs) => { 121 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 122 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 123 - } 124 - clearResults() { 125 - this.results = []; 126 - this.resultsCache = []; 127 - this.collabFiltersResults = []; 128 - } 129 - getLink(xwikiDocSpace) { 130 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 131 - } 132 - handleKeyPress(e) { 133 - if (e.keyCode === 13) { 134 - this.handleSearch(true); 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]); 135 135 } 86 + console.log(urlParams); 136 136 } 137 - render() { 138 - return html` 139 -<div> 140 - <div> 141 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 142 - <button @click="${() => this.handleSearch(true)}">Search</button> 143 - </div> 144 - <div> 145 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 146 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 147 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 148 - </div> 149 - <div> 150 - ${this.results.map(result => html` 151 - <div class="result"> 152 - <a href="${this.getLink(result.space)}">${result.title_}</a> 153 - <div>${result.doccontent_.substring(0, 150)} 154 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 155 - </div> 156 - `)} 157 - </div> 158 - <div class="rawResults"> 159 - <div> 160 - <strong>XWiki Search Results</strong> 161 - <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> 162 - </div> 163 - <div> 164 - <strong>Collab Search Results (Filters)</strong> 165 - <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul> 166 - </div> 167 - </div> 168 -</div> 169 -` 170 - } 171 - } 172 - customElements.define('clb-unified-search', UnifiedSearch); 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('') 105 + } 173 173 174 - functionhandleXWikiSearch(searchString){175 - return new Promise((resolve)=>{107 + }); 108 + function handleXWikiSearch(space, callback) { 176 176 require(['jquery'], function($) { 177 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 178 - //contextSearchButton.addEventListener('click', 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() { 179 179 $.post(solrServiceURL, { 180 - outputSyntax: 'plain', 181 - media: 'json', 182 - query: [ 183 - 'q="__INPUT__"~100', 184 - 'fq=type:DOCUMENT', 185 - `fq=space:Collabs.*` 186 - ].join('\n'), 187 - input: searchString 188 - }).then(resolve); 189 - //}); 190 - }); 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 + }); 191 191 }); 192 192 } 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 + } 193 193 }); 149 + 150 + 194 194 </script> 195 -<clb-unified-search></clb-unified-search> 196 196 {{/html}}