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,178 +1,121 @@ 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 +<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> 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; 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 - `; 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(); 37 + 38 + function removeRole(role) { 39 + filters.roles = filters.roles.filter(r => r !== role) 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 - if(this.searchText !== "" || textSearch) { 69 - // if(this.searchText !== this.prevSearchText) { 70 - this.clearResults(); 71 - this.prevSearchText = this.searchText; 72 - this.fetchWikiSearch().then(results => { 73 - this.resultsCache = results; 74 - if(this.hasActiveFilters()) { 75 - this.fetchFilterSearch().then(this.filterResults); 76 - } else { 77 - this.results = results; 78 - } 79 - }) 80 - /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 81 - this.fetchFilterSearch().then(this.filterResults) 41 + 42 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 43 + console.log(filterInputs); 44 + filterInputs.forEach(function(filterIpt) { 45 + console.log(filterIpt); 46 + filterIpt.addEventListener('click', function() { 47 + const role = this.getAttribute('data-role-filter'); 48 + if(this.checked) { 49 + addRole(role); 82 82 } else { 83 - this.results = this.resultsCache;51 + removeRole(role); 84 84 } 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 - }) 53 + console.log(filters); 54 + }) 55 + }); 56 + 57 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 58 + const contextSearchType = document.getElementById("context-search-type"); 59 + const contextSearchText = document.getElementById("context-search-text"); 60 + const contextSearchResponse = document.getElementById("context-search-response"); 61 + const contextSearchButton = document.getElementById("context-search-button"); 62 + contextSearchButton.addEventListener('click', function() { 63 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 64 + const term = contextSearchText.value; 65 + switch(context) { 66 + case 'collabs': 67 + document.location.href = `/bin/view/Collabs/#search=${term}`; 68 + break; 69 + case 'current-collab': 70 + handleXWikiSearch('bougaultx'); 71 + break 72 + default: 73 + handleXWikiSearch('', applyAdministratorFilter) 92 92 } 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, this.offset, this.nb); 101 - } 102 - fetchFilterSearch() { 103 - return new Promise((resolve) => { 104 - if(this.hasActiveFilters()) { 105 - fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); 106 - } else { 107 - resolve([]); 108 - } 109 - }); 110 - } 111 - filterResults = (filteredCollabs) => { 112 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 113 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 114 - } 115 - clearResults() { 116 - this.results = []; 117 - this.resultsCache = []; 118 - } 119 - getLink(xwikiDocSpace) { 120 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 121 - } 122 - handleKeyPress(e) { 123 - if (e.keyCode === 13) { 124 - this.handleSearch(true); 125 - } 126 - } 127 - render() { 128 - return html` 129 -<div> 130 - <div> 131 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 132 - <input @change="${this.setNb}"" type="text" value="${this.nb}" /> 133 - <input @change="${this.setOffset}"" type="text" value="${this.offset}" /> 134 - <button @click="${() => this.handleSearch(true)}">Search</button> 135 - </div> 136 - <div> 137 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 138 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 139 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 140 - </div> 141 - <div> 142 - ${this.results.map(result => html` 143 - <div class="result"> 144 - <a href="${this.getLink(result.space)}">${result.title_}</a> 145 - <div>${result.doccontent_.substring(0, 150)} 146 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 147 - </div> 148 - `)} 149 - </div> 150 -` 151 - } 152 - } 153 - customElements.define('clb-unified-search', UnifiedSearch); 154 154 155 - functionhandleXWikiSearch(searchString,offset, nb){156 - return new Promise((resolve)=>{76 + }); 77 + function handleXWikiSearch(space, callback) { 157 157 require(['jquery'], function($) { 158 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 159 - //contextSearchButton.addEventListener('click', function() { 160 - $.get(solrServiceURL, { 161 - outputSyntax: 'plain', 162 - media: 'json', 163 - nb: nb, 164 - offset: offset, 165 - query: [ 166 - 'q="__INPUT__"~100', 167 - 'fq=type:DOCUMENT', 168 - `fq=space:Collabs.*` 169 - ].join('\n'), 170 - input: searchString 171 - }).then(resolve); 172 - //}); 173 - }); 79 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 80 + const contextSearchButton = document.getElementById("context-search-button"); 81 + const xwikiSpace = space ? `.${space}` : ''; 82 + contextSearchButton.addEventListener('click', function() { 83 + $.post(solrServiceURL, { 84 + outputSyntax: 'plain', 85 + media: 'json', 86 + query: [ 87 + 'q="__INPUT__"~100', 88 + 'fq=type:DOCUMENT', 89 + `fq=space:Collabs${xwikiSpace}.*` 90 + ].join('\n'), 91 + input: $('#context-search-text').val() 92 + }).then(res => { 93 + if(callback) { 94 + callback(res).then(results => { 95 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 96 + }) 97 + } else { 98 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 99 + } 100 + }); 101 + }); 174 174 }); 175 175 } 104 + function applyAdministratorFilter(results) { 105 + return new Promise((resolve, reject) => { 106 + //fetch("/rest/v1/collabs?roles=administrator") 107 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 108 + .then(res => res.json()) 109 + .then(collabs => { 110 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 111 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 112 + resolve(filtered); 113 + }) 114 + 115 + }) 116 + } 176 176 }); 118 + 119 + 177 177 </script> 178 - <clb-unified-search></clb-unified-search>{{/html}}121 +{{/html}}