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