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