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,121 +1,153 @@ 1 1 {{html clean="false"}} 2 +<!-- 3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 +--> 5 +<script type="module"> 6 +import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 7 +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 -<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); 9 + class UnifiedSearch extends LitElement { 10 + /* 11 + static properties = { 12 + searchText: { type: String }, 13 + favoritesFilter: { type: Boolean }, 14 + administratorFilter: { type: Boolean }, 15 + editorFilter: { type: Boolean }, 16 + viewerFilter: { type: Boolean }, 17 + publicFilter: { type: Boolean }, 18 + privateFilter: { type: Boolean }, 19 + } 20 + */ 21 + static properties = { 22 + results: { type: Array } 23 + } 24 + static styles = css` 25 + .result { 26 + margin-top: 1em; 35 35 } 28 + .light { 29 + color: var(--color-gray-500, #CCC); 30 + font-size: 14px; 31 + } 32 + a { 33 + color: var(--color-brand-primary, blue); 34 + } 35 + `; 36 + constructor() { 37 + super(); 38 + this.searchText = ""; 39 + this.prevSearchText = ""; 40 + this.administrator = false; 41 + this.editor = false; 42 + this.viewer = false; 43 + this.rolesFilter = []; 44 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`); 45 + this.results = []; 36 36 } 37 - 38 - function removeRole(role) { 39 - filters.roles = filters.roles.filter(r => r !== role) 47 + toggleRoleFilter(roleName) { 48 + if(this.rolesFilter.indexOf(roleName) == -1) { 49 + this.rolesFilter.push(roleName); 50 + } else { 51 + this.rolesFilter.filter(role => role !== roleName); 52 + } 53 + this[roleName] = !this[roleName]; 54 + this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 55 + this.handleSearch(); 40 40 } 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); 57 + setSearchText(e) { 58 + this.searchText = e.target.value; 59 + } 60 + handleSearch() { 61 + if(this.searchText !== "" && this.searchText !== this.prevSearchText) { 62 + this.prevSearchText = this.searchText; 63 + Promise.all([ 64 + this.fetchWikiSearch(), 65 + this.fetchFilterSearch() 66 + ]).then(([wikiSearchResults, collabSearchResults]) => { 67 + console.log(wikiSearchResults, collabSearchResults); 68 + }); 69 + } else if (this.searchText === this.prevSearchText) { 70 + console.log("Only apply filter on results"); 71 + this.fetchFilterSearch().then(res => res.json()).then(this.filterResults) 72 + } else { 73 + console.log("no search text, should return filter search results if any"); 74 + this.fetchFilterSearch().then(res => res.json()).then(collabs => { 75 + console.log("Format and display collabs", collabs); 76 + }) 77 + } 78 + } 79 + hasActiveFilters() { 80 + // we only look at role filters for POC. 81 + return this.roles.length > 0; 82 + } 83 + fetchWikiSearch() { 84 + // request should be built from component, not from "external" dependency. Leave it here like this for POC. 85 + return handleXWikiSearch(this.searchText); 86 + } 87 + fetchFilterSearch() { 88 + return new Promise((resolve) => { 89 + if(this.hasActiveFilters) { 90 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 50 50 } else { 51 - re moveRole(role);92 + resolve(null); 52 52 } 53 - console.log(filters); 54 - }) 55 - }); 94 + }); 95 + } 96 + filterResults(filteredCollabs) { 97 + console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 98 + } 99 + getLink(xwikiDocSpace) { 100 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 101 + } 102 + render() { 103 + return html` 104 +<div> 105 + <div> 106 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 107 + <button @click="${this.handleSearch}">Search</button> 108 + </div> 109 + <div> 110 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 111 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 112 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 113 + </div> 114 + <div> 115 + ${this.results.map(result => html` 116 + <div class="result"> 117 + <a href="${this.getLink(result.space)}">${result.title_}</a> 118 + <div>${result.doccontent_.substring(0, 150)} 119 + <div class="light">${result.space.replaceAll('.', ' / ')}</div> 120 + </div> 121 + `)} 122 + </div> 123 +</div> 124 +` 125 + } 126 + } 127 + customElements.define('clb-unified-search', UnifiedSearch); 56 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) 74 - } 75 - 76 - }); 77 - function handleXWikiSearch(space, callback) { 129 + function handleXWikiSearch(searchString) { 130 + return new Promise((resolve) => { 78 78 require(['jquery'], function($) { 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() { 132 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 133 + //contextSearchButton.addEventListener('click', function() { 83 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 - }); 135 + outputSyntax: 'plain', 136 + media: 'json', 137 + query: [ 138 + 'q="__INPUT__"~100', 139 + 'fq=type:DOCUMENT', 140 + `fq=space:Collabs.*` 141 + ].join('\n'), 142 + input: searchString 143 + }).then(resolve); 144 + //}); 145 + }); 102 102 }); 103 103 } 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 - } 117 117 }); 149 +</script> 118 118 151 +<clb-unified-search></clb-unified-search> 119 119 120 -</script> 121 121 {{/html}}