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,129 @@ 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 -<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 9 10 - class UnifiedSearch extends LitElement { 11 - static properties = { 12 - results: { type: Array }, 13 - resultsCache: { type: Array }, 14 - collabFiltersResults: { type: Array} 15 - } 16 - static styles = css` 17 - :host > div { 18 - padding-bottom: 4em; 3 +<select id="context-search-type"> 4 + <option value="all">All</option> 5 + <option value="collabs">Collabs</option> 6 + <option value="current-collab">Current Collab</option> 7 +</select> 8 +<input type="text" id="context-search-text" /> 9 +<button id="context-search-button" class="btn btn-primary">Search</button> 10 +<div class="form-group"> 11 + <label> 12 + <input type="checkbox" data-role-filter="administrator"> Administrator 13 + </label> 14 + <label> 15 + <input type="checkbox" data-role-filter="editor"> Editor 16 + </label> 17 +</div> 18 + 19 + 20 +<pre id="context-search-response"></pre> 21 +<script> 22 + window.addEventListener('DOMContentLoaded', function() { 23 + const filters = { 24 + search: '', 25 + offset: 0, 26 + orderField: 'title', 27 + order: 'asc', 28 + favorite: false, 29 + roles: [] // to be joined as administrator+editor+viewer 30 + }; 31 + 32 + function addRole(role) { 33 + if(filters.roles.indexOf(role) == -1) { 34 + filters.roles.push(role); 19 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 - constructor() { 41 - super(); 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 = []; 51 51 } 52 - firstUpdated() { 53 - this.renderRoot.getElementById('searchInput').focus(); 37 + 38 + function removeRole(role) { 39 + filters.roles = filters.roles.filter(r => r !== role) 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 - setSearchText(e) { 66 - this.searchText = e.target.value; 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) 41 + 42 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 43 + 44 + filterInputs.forEach(function(filterIpt) { 45 + filterIpt.addEventListener('click', function() { 46 + const role = this.getAttribute('data-role-filter'); 47 + if(this.checked) { 48 + addRole(role); 83 83 } else { 84 - this.results = this.resultsCache;50 + removeRole(role); 85 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 - }) 52 + runFilteredRequest(); 53 + }) 54 + }); 55 + 56 + function runFilteredRequest() { 57 + const urlParams = new URLSearchParams(); 58 + const tmpFilters = filters; 59 + tmpFilters.roles = tmpFilters.roles.join("+"); 60 + for(filter in tmpFilters) { 61 + urlParams.set(filter, tmpFilters[filter]); 92 92 } 63 + console.log(urlParams); 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); 65 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 66 + const contextSearchType = document.getElementById("context-search-type"); 67 + const contextSearchText = document.getElementById("context-search-text"); 68 + const contextSearchResponse = document.getElementById("context-search-response"); 69 + const contextSearchButton = document.getElementById("context-search-button"); 70 + contextSearchButton.addEventListener('click', function() { 71 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 72 + const term = contextSearchText.value; 73 + switch(context) { 74 + case 'collabs': 75 + document.location.href = `/bin/view/Collabs/#search=${term}`; 76 + break; 77 + case 'current-collab': 78 + handleXWikiSearch('bougaultx'); 79 + break 80 + default: 81 + handleXWikiSearch('') 128 128 } 129 - } 130 - render() { 131 - return html` 132 -<div> 133 - <div> 134 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 135 - <button @click="${() => this.handleSearch(true)}">Search</button> 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> 161 -</div> 162 -` 163 - } 164 - } 165 - customElements.define('clb-unified-search', UnifiedSearch); 166 166 167 - functionhandleXWikiSearch(searchString){168 - return new Promise((resolve)=>{84 + }); 85 + function handleXWikiSearch(space, callback) { 169 169 require(['jquery'], function($) { 170 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 171 - //contextSearchButton.addEventListener('click', function() { 87 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 88 + const contextSearchButton = document.getElementById("context-search-button"); 89 + const xwikiSpace = space ? `.${space}` : ''; 90 + 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 - }); 92 + outputSyntax: 'plain', 93 + media: 'json', 94 + query: [ 95 + 'q="__INPUT__"~100', 96 + 'fq=type:DOCUMENT', 97 + `fq=space:Collabs${xwikiSpace}.*` 98 + ].join('\n'), 99 + input: $('#context-search-text').val() 100 + }).then(res => { 101 + if(callback) { 102 + callback(res).then(results => { 103 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 104 + }) 105 + } else { 106 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 107 + } 108 + }); 109 + }); 184 184 }); 185 185 } 112 + function applyAdministratorFilter(results) { 113 + return new Promise((resolve, reject) => { 114 + //fetch("/rest/v1/collabs?roles=administrator") 115 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 116 + .then(res => res.json()) 117 + .then(collabs => { 118 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 119 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 120 + resolve(filtered); 121 + }) 122 + 123 + }) 124 + } 186 186 }); 126 + 127 + 187 187 </script> 188 -<clb-unified-search></clb-unified-search> 189 189 {{/html}}