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,181 +1,117 @@ 1 +{{html clean="false"}} 1 1 2 -{{html clean="false"}}<!-- 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() { 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 +<div class="form-group"> 9 +<label> 10 + <input type="checkbox" data-role-filter="administrator"> Administrator 11 +</label> 12 +</div> 13 +<input type="text" id="context-search-text" /> 14 +<button id="context-search-button" class="btn btn-primary">Search</button> 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; 16 +<pre id="context-search-response"></pre> 17 +<script> 18 + window.addEventListener('DOMContentLoaded', function() { 19 + const filters = { 20 + search: '', 21 + offset: 0, 22 + orderField: 'title', 23 + order: 'asc', 24 + favorite: false, 25 + roles: [] // to be joined as administrator+editor+viewer 26 + }; 27 + 28 + function addRole(role) { 29 + if(filters.roles.indexOf(role) == -1) { 30 + 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 - `; 31 - constructor() { 32 - super(); 33 - this.searchText = ""; 34 - this.prevSearchText = ""; 35 - this.administrator = false; 36 - this.editor = false; 37 - this.viewer = false; 38 - this.rolesFilter = []; 39 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 40 - this.results = []; 41 - this.resultsCache = []; 42 - this.offset = 0; 43 - this.nb = 10; 44 44 } 45 - firstUpdated() { 46 - this.renderRoot.getElementById('searchInput').focus(); 33 + 34 + function removeRole(role) { 35 + filters.roles.filter(r => r !== 'administrator') 47 47 } 48 - toggleRoleFilter(roleName) { 49 - if(this.rolesFilter.indexOf(roleName) === -1) { 50 - this.rolesFilter.push(roleName); 51 - } else { 52 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 53 - } 54 - this[roleName] = !this[roleName]; 55 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 56 - this.handleSearch(); 57 - } 58 - setSearchText(e) { 59 - this.searchText = e.target.value; 60 - } 61 - setOffset(e) { 62 - this.offset = e.target.value; 63 - } 64 - setNb(e) { 65 - this.nb = e.target.value; 66 - } 67 - handleSearch(textSearch) { 68 - console.log(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 - console.log('results', results); 75 - //this.resultsCache = results; 76 - if(this.hasActiveFilters()) { 77 - this.fetchFilterSearch().then(this.filterResults); 78 - } else { 79 - this.results = results ? results : []; 80 - } 81 - }) 82 - /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 83 - this.fetchFilterSearch().then(this.filterResults) 37 + 38 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 39 + console.log(filterInputs); 40 + filterInputs.forEach(function(filterIpt) { 41 + console.log(filterIpt); 42 + filterIpt.addEventListener('click', function() { 43 + const role = this.getAttribute('data-role-filter'); 44 + if(this.checked) { 45 + addRole(role); 84 84 } else { 85 - this.results = this.resultsCache;47 + removeRole(role); 86 86 } 87 - */ 88 - } else { 89 - this.results = []; 90 - this.clearResults(); 91 - console.log("no search text, should return filter search results if any"); 92 - this.fetchFilterSearch().then(collabs => { 93 - console.log("Format and display collabs", collabs); 94 - }) 49 + console.log(filters); 50 + }) 51 + }); 52 + 53 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 54 + const contextSearchType = document.getElementById("context-search-type"); 55 + const contextSearchText = document.getElementById("context-search-text"); 56 + const contextSearchResponse = document.getElementById("context-search-response"); 57 + const contextSearchButton = document.getElementById("context-search-button"); 58 + contextSearchButton.addEventListener('click', function() { 59 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 60 + const term = contextSearchText.value; 61 + switch(context) { 62 + case 'collabs': 63 + document.location.href = `/bin/view/Collabs/#search=${term}`; 64 + break; 65 + case 'current-collab': 66 + handleXWikiSearch('bougaultx'); 67 + break 68 + default: 69 + handleXWikiSearch('', applyAdministratorFilter) 95 95 } 96 - } 97 - hasActiveFilters() { 98 - // we only look at role filters for POC. 99 - return this.rolesFilter.length > 0; 100 - } 101 - fetchWikiSearch() { 102 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 103 - return handleXWikiSearch(this.searchText, this.offset, this.nb); 104 - } 105 - fetchFilterSearch() { 106 - return new Promise((resolve) => { 107 - if(this.hasActiveFilters()) { 108 - fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); 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 - render() { 131 - return html` 132 -<div> 133 - <div> 134 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 135 - <input @change="${this.setNb}"" type="text" value="${this.nb}" /> 136 - <input @change="${this.setOffset}"" type="text" value="${this.offset}" /> 137 - <button @click="${() => this.handleSearch(true)}">Search</button> 138 - </div> 139 - <div> 140 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 141 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 142 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 143 - </div> 144 - <div> 145 - ${this.results.map(result => html` 146 - <div class="result"> 147 - <a href="${this.getLink(result.space)}">${result.title_}</a> 148 - <div>${result.doccontent_.substring(0, 150)} 149 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 150 - </div> 151 - `)} 152 - </div> 153 -` 154 - } 155 - } 156 - customElements.define('clb-unified-search', UnifiedSearch); 157 157 158 - functionhandleXWikiSearch(searchString,offset, nb){159 - return new Promise((resolve)=>{72 + }); 73 + function handleXWikiSearch(space, callback) { 160 160 require(['jquery'], function($) { 161 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 162 - //contextSearchButton.addEventListener('click', function() { 163 - $.get(solrServiceURL, { 164 - outputSyntax: 'plain', 165 - media: 'json', 166 - nb: nb, 167 - offset: offset, 168 - query: [ 169 - 'q="__INPUT__"~100', 170 - 'fq=type:DOCUMENT', 171 - `fq=space:Collabs.*` 172 - ].join('\n'), 173 - input: searchString 174 - }).then(resolve); 175 - //}); 176 - }); 75 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 76 + const contextSearchButton = document.getElementById("context-search-button"); 77 + const xwikiSpace = space ? `.${space}` : ''; 78 + contextSearchButton.addEventListener('click', function() { 79 + $.post(solrServiceURL, { 80 + outputSyntax: 'plain', 81 + media: 'json', 82 + query: [ 83 + 'q="__INPUT__"~100', 84 + 'fq=type:DOCUMENT', 85 + `fq=space:Collabs${xwikiSpace}.*` 86 + ].join('\n'), 87 + input: $('#context-search-text').val() 88 + }).then(res => { 89 + if(callback) { 90 + callback(res).then(results => { 91 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 92 + }) 93 + } else { 94 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 95 + } 96 + }); 97 + }); 177 177 }); 178 178 } 100 + function applyAdministratorFilter(results) { 101 + return new Promise((resolve, reject) => { 102 + //fetch("/rest/v1/collabs?roles=administrator") 103 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 104 + .then(res => res.json()) 105 + .then(collabs => { 106 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 107 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 108 + resolve(filtered); 109 + }) 110 + 111 + }) 112 + } 179 179 }); 114 + 115 + 180 180 </script> 181 - <clb-unified-search></clb-unified-search>{{/html}}117 +{{/html}}