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,189 +1,176 @@ 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 ---> 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 - 3 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 10 10 class UnifiedSearch extends LitElement { 11 11 static properties = { 12 - results: { type: Array }, 13 - resultsCache: { type: Array }, 14 - collabFiltersResults: { type: Array} 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 }, 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 pre { 37 - overflow: scroll; 38 - } 39 - `; 40 40 constructor() { 41 41 super(); 42 42 this.searchText = ""; 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 = []; 17 + this.favoritesFilter = false; 18 + this.administratorFilter = true; 19 + this.editorFilter = false; 20 + this.viewerFilter = false; 21 + this.publicFilter = false; 22 + this.privateFilter = false; 51 51 } 52 - firstUpdated() {53 - this.renderRoot.getElementById('searchInput').focus();24 + toggleFilter(filter) { 25 + filter = !filter 54 54 } 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 - } 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 - } 30 + handleSearch() { 31 + 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 - 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 - } 130 130 render() { 131 131 return html` 132 132 <div> 133 133 <div> 134 - <input id="searchInput"@change="${this.setSearchText}" type="text" placeholder="Search..."@keypress="${this.handleKeyPress}"/>135 - <button @click="${ () =>this.handleSearch(true)}">Search</button>37 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 38 + <button @click="${this.handleSearch}">Search</button> 136 136 </div> 137 - <div> 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> 141 - </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> 40 + <label><input type="checkbox" @change="${() => toggleFilter(this.administratorFilter)}" .checked="${this.administratorFilter}"/> Administrator</label> 161 161 </div> 162 162 ` 163 163 } 164 164 } 165 165 customElements.define('clb-unified-search', UnifiedSearch); 46 +</script> 166 166 167 - function handleXWikiSearch(searchString) { 168 - return new Promise((resolve) => { 48 +<clb-unified-search></clb-unified-search> 49 + 50 +<select id="context-search-type"> 51 + <option value="all">All</option> 52 + <option value="collabs">Collabs</option> 53 + <option value="current-collab">Current Collab</option> 54 +</select> 55 +<input type="text" id="context-search-text" /> 56 +<button id="context-search-button" class="btn btn-primary">Search</button> 57 +<div class="form-group"> 58 + <label> 59 + <input type="checkbox" data-role-filter="administrator"> Administrator 60 + </label> 61 + <label> 62 + <input type="checkbox" data-role-filter="editor"> Editor 63 + </label> 64 +</div> 65 + 66 + 67 +<pre id="context-search-response"></pre> 68 +<script> 69 + window.addEventListener('DOMContentLoaded', function() { 70 + const filters = { 71 + search: '', 72 + offset: 0, 73 + orderField: 'title', 74 + order: 'asc', 75 + favorite: false, 76 + roles: [] // to be joined as administrator+editor+viewer 77 + }; 78 + 79 + function addRole(role) { 80 + if(filters.roles.indexOf(role) == -1) { 81 + filters.roles.push(role); 82 + } 83 + } 84 + 85 + function removeRole(role) { 86 + filters.roles = filters.roles.filter(r => r !== role) 87 + } 88 + 89 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 90 + 91 + filterInputs.forEach(function(filterIpt) { 92 + filterIpt.addEventListener('click', function() { 93 + const role = this.getAttribute('data-role-filter'); 94 + if(this.checked) { 95 + addRole(role); 96 + } else { 97 + removeRole(role); 98 + } 99 + runFilteredRequest(); 100 + }) 101 + }); 102 + 103 + function runFilteredRequest() { 104 + const urlParams = new URLSearchParams(); 105 + const tmpFilters = filters; 106 + tmpFilters.roles = tmpFilters.roles.join("+"); 107 + for(filter in tmpFilters) { 108 + urlParams.set(filter, tmpFilters[filter]); 109 + } 110 + console.log(urlParams); 111 + } 112 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 113 + const contextSearchType = document.getElementById("context-search-type"); 114 + const contextSearchText = document.getElementById("context-search-text"); 115 + const contextSearchResponse = document.getElementById("context-search-response"); 116 + const contextSearchButton = document.getElementById("context-search-button"); 117 + contextSearchButton.addEventListener('click', function() { 118 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 119 + const term = contextSearchText.value; 120 + switch(context) { 121 + case 'collabs': 122 + document.location.href = `/bin/view/Collabs/#search=${term}`; 123 + break; 124 + case 'current-collab': 125 + handleXWikiSearch('bougaultx'); 126 + break 127 + default: 128 + handleXWikiSearch('') 129 + } 130 + 131 + }); 132 + function handleXWikiSearch(space, callback) { 169 169 require(['jquery'], function($) { 170 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 171 - //contextSearchButton.addEventListener('click', function() { 134 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 135 + const contextSearchButton = document.getElementById("context-search-button"); 136 + const xwikiSpace = space ? `.${space}` : ''; 137 + contextSearchButton.addEventListener('click', function() { 172 172 $.post(solrServiceURL, { 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 - }); 139 + outputSyntax: 'plain', 140 + media: 'json', 141 + query: [ 142 + 'q="__INPUT__"~100', 143 + 'fq=type:DOCUMENT', 144 + `fq=space:Collabs${xwikiSpace}.*` 145 + ].join('\n'), 146 + input: $('#context-search-text').val() 147 + }).then(res => { 148 + if(callback) { 149 + callback(res).then(results => { 150 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 151 + }) 152 + } else { 153 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 154 + } 155 + }); 156 + }); 184 184 }); 185 185 } 159 + function applyAdministratorFilter(results) { 160 + return new Promise((resolve, reject) => { 161 + //fetch("/rest/v1/collabs?roles=administrator") 162 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 163 + .then(res => res.json()) 164 + .then(collabs => { 165 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 166 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 167 + resolve(filtered); 168 + }) 169 + 170 + }) 171 + } 186 186 }); 173 + 174 + 187 187 </script> 188 -<clb-unified-search></clb-unified-search> 189 189 {{/html}}