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,140 +1,56 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 - !!! Many optimisations can be done !!! 3 + !!! POC. Code would must be reviewed / optimized and packaged for use in production !!! 5 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';6 +import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 8 8 window.addEventListener('DOMContentLoaded', function() { 9 9 10 10 class UnifiedSearch extends LitElement { 10 + /* 11 11 static properties = { 12 - results: { type: Array }, 13 - resultsCache: { type: Array }, 14 - collabFiltersResults: { type: Array} 12 + searchText: { type: String }, 13 + favoritesFilter: { type: Boolean }, 14 + administratorFilter: { type: Boolean }, 15 + editorFilter: { type: Boolean }, 16 + viewerFilter: { type: Boolean }, 17 + publicFilter: { type: Boolean }, 18 + privateFilter: { type: Boolean }, 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 ul { 37 - list-style-type: none; 38 - padding: 0; 39 - } 40 - `; 20 + */ 41 41 constructor() { 42 42 super(); 43 43 this.searchText = ""; 44 - this.prevSearchText = ""; 45 45 this.administrator = false; 46 46 this.editor = false; 47 47 this.viewer = false; 48 48 this.rolesFilter = []; 49 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 50 - this.results = []; 51 - this.resultsCache = []; 52 - this.collabFiltersResults = []; 28 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`); 53 53 } 54 - firstUpdated() { 55 - this.renderRoot.getElementById('searchInput').focus(); 56 - } 57 57 toggleRoleFilter(roleName) { 58 - if(this.rolesFilter.indexOf(roleName) == =-1) {31 + if(this.rolesFilter.indexOf(roleName) == -1) { 59 59 this.rolesFilter.push(roleName); 60 60 } else { 61 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);34 + this.rolesFilter.filter(role => role !== roleName); 62 62 } 63 63 this[roleName] = !this[roleName]; 64 64 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 65 - this.handleSearch(); 66 66 } 67 67 setSearchText(e) { 68 68 this.searchText = e.target.value; 69 69 } 70 - handleSearch(textSearch) { 71 - if(this.searchText !== "" || textSearch) { 72 - if(this.searchText !== this.prevSearchText) { 73 - this.clearResults(); 74 - this.prevSearchText = this.searchText; 75 - this.fetchWikiSearch().then(results => { 76 - this.resultsCache = results; 77 - if(this.hasActiveFilters()) { 78 - this.fetchFilterSearch().then(this.filterResults); 79 - } else { 80 - this.results = results; 81 - } 82 - }) 83 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 84 - this.fetchFilterSearch().then(this.filterResults) 85 - } else { 86 - this.results = this.resultsCache; 87 - } 88 - } else { 89 - this.clearResults(); 90 - console.log("no search text, should return filter search results if any"); 91 - this.fetchFilterSearch().then(collabs => { 92 - console.log("Format and display collabs", collabs); 93 - }) 94 - } 42 + handleSearch() { 43 + console.log(this.searchText); 95 95 } 96 - hasActiveFilters() { 97 - // we only look at role filters for POC. 98 - return this.rolesFilter.length > 0; 45 + buildFilter() { 46 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 99 99 } 100 - fetchWikiSearch() { 101 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 102 - return handleXWikiSearch(this.searchText); 103 - } 104 - fetchFilterSearch() { 105 - return new Promise((resolve) => { 106 - if(this.hasActiveFilters()) { 107 - fetch(this.filterUrl).then(res => res.json()).then((res) => { 108 - this.collabFiltersResults = res; 109 - resolve(res); 110 - }); 111 - } else { 112 - resolve([]); 113 - } 114 - }); 115 - } 116 - filterResults = (filteredCollabs) => { 117 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 118 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 119 - } 120 - clearResults() { 121 - this.results = []; 122 - this.resultsCache = []; 123 - } 124 - getLink(xwikiDocSpace) { 125 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 126 - } 127 - handleKeyPress(e) { 128 - if (e.keyCode === 13) { 129 - this.handleSearch(true); 130 - } 131 - } 132 132 render() { 133 133 return html` 134 134 <div> 135 135 <div> 136 - <input id="searchInput"@change="${this.setSearchText}" type="text" placeholder="Search..."@keypress="${this.handleKeyPress}"/>137 - <button @click="${ () =>this.handleSearch(true)}">Search</button>52 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 53 + <button @click="${this.handleSearch}">Search</button> 138 138 </div> 139 139 <div> 140 140 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> ... ... @@ -141,25 +141,6 @@ 141 141 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 142 142 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 143 143 </div> 144 - <div> 145 - ${this.results.map(result => html` 146 - <div class="result"> 147 - <a href="${this.getLink(result.space)}">${result.title_}</a> 148 - <div>${result.doccontent_.substring(0, 150)} 149 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 150 - </div> 151 - `)} 152 - </div> 153 - <div class="rawResults"> 154 - <div> 155 - <strong>XWiki Search Results</strong> 156 - <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> 157 - </div> 158 - <div> 159 - <strong>Collab Search Results (Filters)</strong> 160 - <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul> 161 - </div> 162 - </div> 163 163 </div> 164 164 ` 165 165 } ... ... @@ -166,26 +166,161 @@ 166 166 } 167 167 customElements.define('clb-unified-search', UnifiedSearch); 168 168 169 - function handleXWikiSearch(searchString) { 170 - return new Promise((resolve) => { 171 - require(['jquery'], function($) { 172 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 173 - //contextSearchButton.addEventListener('click', function() { 174 - $.post(solrServiceURL, { 175 - outputSyntax: 'plain', 176 - media: 'json', 177 - query: [ 178 - 'q="__INPUT__"~100', 179 - 'fq=type:DOCUMENT', 180 - `fq=space:Collabs.*` 181 - ].join('\n'), 182 - input: searchString 183 - }).then(resolve); 184 - //}); 66 + function handleXWikiSearch(space, callback) { 67 + require(['jquery'], function($) { 68 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 69 + const contextSearchButton = document.getElementById("context-search-button"); 70 + const xwikiSpace = space ? `.${space}` : ''; 71 + contextSearchButton.addEventListener('click', function() { 72 + $.post(solrServiceURL, { 73 + outputSyntax: 'plain', 74 + media: 'json', 75 + query: [ 76 + 'q="__INPUT__"~100', 77 + 'fq=type:DOCUMENT', 78 + `fq=space:Collabs${xwikiSpace}.*` 79 + ].join('\n'), 80 + input: $('#context-search-text').val() 81 + }).then(res => { 82 + if(callback) { 83 + callback(res).then(results => { 84 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 85 + }) 86 + } else { 87 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 88 + } 89 + }); 185 185 }); 186 186 }); 187 187 } 188 188 }); 189 189 </script> 95 + 190 190 <clb-unified-search></clb-unified-search> 97 +<!-- 98 +<select id="context-search-type"> 99 + <option value="all">All</option> 100 + <option value="collabs">Collabs</option> 101 + <option value="current-collab">Current Collab</option> 102 +</select> 103 +<input type="text" id="context-search-text" /> 104 +<button id="context-search-button" class="btn btn-primary">Search</button> 105 +<div class="form-group"> 106 + <label> 107 + <input type="checkbox" data-role-filter="administrator"> Administrator 108 + </label> 109 + <label> 110 + <input type="checkbox" data-role-filter="editor"> Editor 111 + </label> 112 +</div> 113 + 114 + 115 +<pre id="context-search-response"></pre> 116 +<script> 117 + window.addEventListener('DOMContentLoaded', function() { 118 + const filters = { 119 + search: '', 120 + offset: 0, 121 + orderField: 'title', 122 + order: 'asc', 123 + favorite: false, 124 + roles: [] // to be joined as administrator+editor+viewer 125 + }; 126 + 127 + function addRole(role) { 128 + if(filters.roles.indexOf(role) == -1) { 129 + filters.roles.push(role); 130 + } 131 + } 132 + 133 + function removeRole(role) { 134 + filters.roles = filters.roles.filter(r => r !== role) 135 + } 136 + 137 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 138 + 139 + filterInputs.forEach(function(filterIpt) { 140 + filterIpt.addEventListener('click', function() { 141 + const role = this.getAttribute('data-role-filter'); 142 + if(this.checked) { 143 + addRole(role); 144 + } else { 145 + removeRole(role); 146 + } 147 + runFilteredRequest(); 148 + }) 149 + }); 150 + 151 + function runFilteredRequest() { 152 + const urlParams = new URLSearchParams(); 153 + const tmpFilters = filters; 154 + tmpFilters.roles = tmpFilters.roles.join("+"); 155 + for(filter in tmpFilters) { 156 + urlParams.set(filter, tmpFilters[filter]); 157 + } 158 + console.log(urlParams); 159 + } 160 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 161 + const contextSearchType = document.getElementById("context-search-type"); 162 + const contextSearchText = document.getElementById("context-search-text"); 163 + const contextSearchResponse = document.getElementById("context-search-response"); 164 + const contextSearchButton = document.getElementById("context-search-button"); 165 + contextSearchButton.addEventListener('click', function() { 166 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 167 + const term = contextSearchText.value; 168 + switch(context) { 169 + case 'collabs': 170 + document.location.href = `/bin/view/Collabs/#search=${term}`; 171 + break; 172 + case 'current-collab': 173 + handleXWikiSearch('bougaultx'); 174 + break 175 + default: 176 + handleXWikiSearch('') 177 + } 178 + 179 + }); 180 + function handleXWikiSearch(space, callback) { 181 + require(['jquery'], function($) { 182 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 183 + const contextSearchButton = document.getElementById("context-search-button"); 184 + const xwikiSpace = space ? `.${space}` : ''; 185 + contextSearchButton.addEventListener('click', function() { 186 + $.post(solrServiceURL, { 187 + outputSyntax: 'plain', 188 + media: 'json', 189 + query: [ 190 + 'q="__INPUT__"~100', 191 + 'fq=type:DOCUMENT', 192 + `fq=space:Collabs${xwikiSpace}.*` 193 + ].join('\n'), 194 + input: $('#context-search-text').val() 195 + }).then(res => { 196 + if(callback) { 197 + callback(res).then(results => { 198 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 199 + }) 200 + } else { 201 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 202 + } 203 + }); 204 + }); 205 + }); 206 + } 207 + function applyAdministratorFilter(results) { 208 + return new Promise((resolve, reject) => { 209 + //fetch("/rest/v1/collabs?roles=administrator") 210 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 211 + .then(res => res.json()) 212 + .then(collabs => { 213 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 214 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 215 + resolve(filtered); 216 + }) 217 + 218 + }) 219 + } 220 +}); 221 +</script> 222 +--> 191 191 {{/html}}