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