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,194 +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 - .rawResults > div { 37 - width: 100%; 38 - } 39 - .rawResults ul { 40 - list-style-type: none; 41 - padding: 0; 42 - } 43 - `; 18 + */ 44 44 constructor() { 45 45 super(); 46 46 this.searchText = ""; 47 - this. prevSearchText ="";22 + this.favoritesFilter = false; 48 48 this.administrator = false; 49 49 this.editor = false; 50 50 this.viewer = false; 26 + this.publicFilter = false; 27 + this.privateFilter = false; 51 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 = []; 29 + this.filterUrl = new URL(document.location.origin); 56 56 } 57 - firstUpdated() {58 - this .renderRoot.getElementById('searchInput').focus();31 + toggleBooleanFilter(filterName) { 32 + this[filterName] = !this[filterName]; 59 59 } 60 60 toggleRoleFilter(roleName) { 61 - if(this.rolesFilter.indexOf(roleName) == =-1) {35 + if(this.rolesFilter.indexOf(roleName) == -1) { 62 62 this.rolesFilter.push(roleName); 63 63 } else { 64 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);38 + this.rolesFilter.filter(role => role !== roleName); 65 65 } 66 - this[roleName] = !this[roleName]; 67 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 68 - this.handleSearch(); 40 + this.toggleBooleanFilter(roleName); 69 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 - } 45 + handleSearch() { 46 + console.log(this.searchText); 98 98 } 99 - hasActiveFilters() { 100 - // we only look at role filters for POC. 101 - 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= 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); 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 - }); 114 - } else { 115 - resolve([]); 116 - } 117 - }); 118 - } 119 - filterResults = (filteredCollabs) => { 120 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 121 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 122 - } 123 - clearResults() { 124 - this.results = []; 125 - this.resultsCache = []; 126 - } 127 - getLink(xwikiDocSpace) { 128 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 129 - } 130 - handleKeyPress(e) { 131 - if (e.keyCode === 13) { 132 - this.handleSearch(true); 133 - } 134 - } 135 135 render() { 136 136 return html` 137 137 <div> 138 138 <div> 139 - <input id="searchInput"@change="${this.setSearchText}" type="text" placeholder="Search..."@keypress="${this.handleKeyPress}"/>140 - <button @click="${ () =>this.handleSearch(true)}">Search</button>55 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 56 + <button @click="${this.handleSearch}">Search</button> 141 141 </div> 142 142 <div> 59 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('favoritesFilter')}" .checked="${this.favoritesFilter}"/> Favorites</label> 143 143 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 144 144 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 145 145 <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> 146 146 </div> 147 - <div> 148 - ${this.results.map(result => html` 149 - <div class="result"> 150 - <a href="${this.getLink(result.space)}">${result.title_}</a> 151 - <div>${result.doccontent_.substring(0, 150)} 152 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 153 - </div> 154 - `)} 155 - </div> 156 - <div class="rawResults"> 157 - <div> 158 - <strong>XWiki Search Results</strong> 159 - <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> 160 - </div> 161 - <div> 162 - <strong>Collab Search Results (Filters)</strong> 163 - <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul> 164 - </div> 165 - </div> 166 166 </div> 167 167 ` 168 168 } 169 169 } 170 170 customElements.define('clb-unified-search', UnifiedSearch); 71 +</script> 171 171 172 - function handleXWikiSearch(searchString) { 173 - 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) { 174 174 require(['jquery'], function($) { 175 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 176 - //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() { 177 177 $.post(solrServiceURL, { 178 - outputSyntax: 'plain', 179 - media: 'json', 180 - query: [ 181 - 'q="__INPUT__"~100', 182 - 'fq=type:DOCUMENT', 183 - `fq=space:Collabs.*` 184 - ].join('\n'), 185 - input: searchString 186 - }).then(resolve); 187 - //}); 188 - }); 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 + }); 189 189 }); 190 190 } 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 + } 191 191 }); 192 192 </script> 193 - <clb-unified-search></clb-unified-search>199 +--> 194 194 {{/html}}