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