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,170 +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 - /* 12 - static properties = { 13 - searchText: { type: String }, 14 - favoritesFilter: { type: Boolean }, 15 - administratorFilter: { type: Boolean }, 16 - editorFilter: { type: Boolean }, 17 - viewerFilter: { type: Boolean }, 18 - publicFilter: { type: Boolean }, 19 - privateFilter: { type: Boolean }, 20 - } 21 - */ 22 - static properties = { 23 - results: { type: Array } 24 - } 25 - static styles = css` 26 - :host { 27 - 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); 28 28 } 29 - .result { 30 - margin-top: 1em; 31 - } 32 - .light { 33 - color: var(--color-gray-500, #CCC); 34 - font-size: 14px; 35 - } 36 - a { 37 - color: var(--color-brand-primary, blue); 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 - toggleRoleFilter(roleName) { 53 - if(this.rolesFilter.indexOf(roleName) === -1) { 54 - this.rolesFilter.push(roleName); 55 - } else { 56 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 57 - } 58 - this[roleName] = !this[roleName]; 59 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 60 - this.handleSearch(); 37 + 38 + function removeRole(role) { 39 + filters.roles = filters.roles.filter(r => r !== role) 61 61 } 62 - setSearchText(e) { 63 - this.searchText = e.target.value; 64 - } 65 - handleSearch(textSearch) { 66 - if(this.searchText !== "" || textSearch) { 67 - if(this.searchText !== this.prevSearchText) { 68 - this.clearResults(); 69 - this.prevSearchText = this.searchText; 70 - this.fetchWikiSearch().then(results => { 71 - this.resultsCache = results; 72 - if(this.hasActiveFilters()) { 73 - this.fetchFilterSearch().then(this.filterResults); 74 - } else { 75 - this.results = results; 76 - } 77 - }) 78 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 79 - 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); 80 80 } else { 81 - this.results = this.resultsCache;50 + removeRole(role); 82 82 } 83 - } else { 84 - this.clearResults(); 85 - console.log("no search text, should return filter search results if any"); 86 - this.fetchFilterSearch().then(collabs => { 87 - console.log("Format and display collabs", collabs); 88 - }) 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]); 89 89 } 63 + console.log(urlParams); 90 90 } 91 - hasActiveFilters() { 92 - // we only look at role filters for POC. 93 - return this.rolesFilter.length > 0; 94 - } 95 - fetchWikiSearch() { 96 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 97 - return handleXWikiSearch(this.searchText); 98 - } 99 - fetchFilterSearch() { 100 - return new Promise((resolve) => { 101 - if(this.hasActiveFilters()) { 102 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 103 - } else { 104 - resolve([]); 105 - } 106 - }); 107 - } 108 - filterResults = (filteredCollabs) => { 109 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 110 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 111 - } 112 - clearResults() { 113 - this.results = []; 114 - this.resultsCache = []; 115 - } 116 - getLink(xwikiDocSpace) { 117 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 118 - } 119 - render() { 120 - return html` 121 -<div> 122 - <div> 123 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 124 - <button @click="${() => this.handleSearch(true)}">Search</button> 125 - </div> 126 - <div> 127 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 128 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 129 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 130 - </div> 131 - <div> 132 - ${this.results.map(result => html` 133 - <div class="result"> 134 - <a href="${this.getLink(result.space)}">${result.title_}</a> 135 - <div>${result.doccontent_.substring(0, 150)} 136 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 137 - </div> 138 - `)} 139 - </div> 140 -</div> 141 -` 142 - } 143 - } 144 - customElements.define('clb-unified-search', UnifiedSearch); 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('') 82 + } 145 145 146 - functionhandleXWikiSearch(searchString){147 - return new Promise((resolve)=>{84 + }); 85 + function handleXWikiSearch(space, callback) { 148 148 require(['jquery'], function($) { 149 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 150 - //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() { 151 151 $.post(solrServiceURL, { 152 - outputSyntax: 'plain', 153 - media: 'json', 154 - query: [ 155 - 'q="__INPUT__"~100', 156 - 'fq=type:DOCUMENT', 157 - `fq=space:Collabs.*` 158 - ].join('\n'), 159 - input: searchString 160 - }).then(resolve); 161 - //}); 162 - }); 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 + }); 163 163 }); 164 164 } 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 + } 165 165 }); 166 -</script> 167 167 168 -<clb-unified-search></clb-unified-search> 169 169 128 +</script> 170 170 {{/html}}