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