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