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