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,124 +1,160 @@ 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 - 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); 57 + setSearchText(e) { 58 + this.searchText = e.target.value; 59 + } 60 + handleSearch() { 61 + if(this.searchText !== "") { 62 + if(this.searchText !== this.prevSearchText) { 63 + console.log(this.searchText, this.prevSearchText); 64 + this.prevSearchText = this.searchText; 65 + Promise.all([ 66 + this.fetchWikiSearch(), 67 + this.fetchFilterSearch() 68 + ]).then(([wikiSearchResults, collabSearchResults]) => { 69 + this.results = wikiSearchResults; 70 + console.log(wikiSearchResults, collabSearchResults); 71 + }); 72 + } else if (this.searchText === this.prevSearchText) { 73 + console.log("Only apply filter on results"); 74 + this.fetchFilterSearch().then(this.filterResults) 75 + } 76 + } else { 77 + console.log("no search text, should return filter search results if any"); 78 + this.fetchFilterSearch().then(collabs => { 79 + console.log("Format and display collabs", collabs); 80 + }) 81 + } 82 + } 83 + hasActiveFilters() { 84 + // we only look at role filters for POC. 85 + return this.roles.length > 0; 86 + } 87 + fetchWikiSearch() { 88 + // request should be built from component, not from "external" dependency. Leave it here like this for POC. 89 + return handleXWikiSearch(this.searchText); 90 + } 91 + fetchFilterSearch() { 92 + return new Promise((resolve) => { 93 + if(this.hasActiveFilters) { 94 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 49 49 } else { 50 - re moveRole(role);96 + resolve(null); 51 51 } 52 - }) 53 - }); 54 - 55 - function filteredRequest() { 56 - for(filter in filters) { 57 - console.log(filter); 58 - } 98 + }); 59 59 } 60 - // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 61 - const contextSearchType = document.getElementById("context-search-type"); 62 - const contextSearchText = document.getElementById("context-search-text"); 63 - const contextSearchResponse = document.getElementById("context-search-response"); 64 - const contextSearchButton = document.getElementById("context-search-button"); 65 - contextSearchButton.addEventListener('click', function() { 66 - const context = contextSearchType.options[contextSearchType.selectedIndex].value; 67 - const term = contextSearchText.value; 68 - switch(context) { 69 - case 'collabs': 70 - document.location.href = `/bin/view/Collabs/#search=${term}`; 71 - break; 72 - case 'current-collab': 73 - handleXWikiSearch('bougaultx'); 74 - break 75 - default: 76 - handleXWikiSearch('') 77 - } 100 + filterResults = (filteredCollabs) => { 101 + console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 102 + const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 103 + const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space))); 104 + console.log(filteredResults); 105 + } 106 + getLink(xwikiDocSpace) { 107 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 108 + } 109 + render() { 110 + return html` 111 +<div> 112 + <div> 113 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 114 + <button @click="${this.handleSearch}">Search</button> 115 + </div> 116 + <div> 117 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 118 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 119 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 120 + </div> 121 + <div> 122 + ${this.results.map(result => html` 123 + <div class="result"> 124 + <a href="${this.getLink(result.space)}">${result.title_}</a> 125 + <div>${result.doccontent_.substring(0, 150)} 126 + <div class="light">${result.space.replaceAll('.', ' / ')}</div> 127 + </div> 128 + `)} 129 + </div> 130 +</div> 131 +` 132 + } 133 + } 134 + customElements.define('clb-unified-search', UnifiedSearch); 78 78 79 - });80 - functionhandleXWikiSearch(space, callback) {136 + function handleXWikiSearch(searchString) { 137 + return new Promise((resolve) => { 81 81 require(['jquery'], function($) { 82 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 83 - const contextSearchButton = document.getElementById("context-search-button"); 84 - const xwikiSpace = space ? `.${space}` : ''; 85 - contextSearchButton.addEventListener('click', function() { 139 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 140 + //contextSearchButton.addEventListener('click', function() { 86 86 $.post(solrServiceURL, { 87 - outputSyntax: 'plain', 88 - media: 'json', 89 - query: [ 90 - 'q="__INPUT__"~100', 91 - 'fq=type:DOCUMENT', 92 - `fq=space:Collabs${xwikiSpace}.*` 93 - ].join('\n'), 94 - input: $('#context-search-text').val() 95 - }).then(res => { 96 - if(callback) { 97 - callback(res).then(results => { 98 - contextSearchResponse.innerText = JSON.stringify(results, null, 2); 99 - }) 100 - } else { 101 - contextSearchResponse.innerText = JSON.stringify(res, null, 2); 102 - } 103 - }); 104 - }); 142 + outputSyntax: 'plain', 143 + media: 'json', 144 + query: [ 145 + 'q="__INPUT__"~100', 146 + 'fq=type:DOCUMENT', 147 + `fq=space:Collabs.*` 148 + ].join('\n'), 149 + input: searchString 150 + }).then(resolve); 151 + //}); 152 + }); 105 105 }); 106 106 } 107 - function applyAdministratorFilter(results) { 108 - return new Promise((resolve, reject) => { 109 - //fetch("/rest/v1/collabs?roles=administrator") 110 - fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 111 - .then(res => res.json()) 112 - .then(collabs => { 113 - const spaces = collabs.map(collab => `Collabs.${collab.name}`); 114 - const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 115 - resolve(filtered); 116 - }) 117 - 118 - }) 119 - } 120 120 }); 156 +</script> 121 121 158 +<clb-unified-search></clb-unified-search> 122 122 123 -</script> 124 124 {{/html}}