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
-
... ... @@ -3,7 +3,7 @@ 3 3 !!! POC. Code would must be reviewed / optimized and packaged for use in production !!! 4 4 --> 5 5 <script type="module"> 6 -import {LitElement, html , css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';6 +import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 7 7 window.addEventListener('DOMContentLoaded', function() { 8 8 9 9 class UnifiedSearch extends LitElement { ... ... @@ -18,21 +18,6 @@ 18 18 privateFilter: { type: Boolean }, 19 19 } 20 20 */ 21 - static properties = { 22 - results: { type: Array } 23 - } 24 - static styles = css` 25 - .result { 26 - margin-top: 1em; 27 - } 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 36 constructor() { 37 37 super(); 38 38 this.searchText = ""; ... ... @@ -41,7 +41,6 @@ 41 41 this.viewer = false; 42 42 this.rolesFilter = []; 43 43 this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`); 44 - this.results = []; 45 45 } 46 46 toggleRoleFilter(roleName) { 47 47 if(this.rolesFilter.indexOf(roleName) == -1) { ... ... @@ -57,14 +57,7 @@ 57 57 } 58 58 handleSearch() { 59 59 console.log(this.searchText); 60 - if(this.searchText !== "") { 61 - this.fetchWikiSearch(); 62 - } 63 63 } 64 - fetchWikiSearch() { 65 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 66 - handleXWikiSearch(this.searchText).then(results => this.results = results); 67 - } 68 68 buildFilter() { 69 69 //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 70 70 } ... ... @@ -80,15 +80,6 @@ 80 80 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 81 81 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 82 82 </div> 83 - <div> 84 - ${this.results.map(result => html` 85 - <div class="result"> 86 - <a href="#">${result.title_}</a> 87 - <div class="light">${result.space}</div> 88 - <div>${result.doccontent_.substring(0, 150)} 89 - </div> 90 - `)} 91 - </div> 92 92 </div> 93 93 ` 94 94 } ... ... @@ -95,22 +95,30 @@ 95 95 } 96 96 customElements.define('clb-unified-search', UnifiedSearch); 97 97 98 - function handleXWikiSearch(searchString) { 99 - return new Promise((resolve) => { 100 - require(['jquery'], function($) { 101 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 102 - //contextSearchButton.addEventListener('click', function() { 103 - $.post(solrServiceURL, { 104 - outputSyntax: 'plain', 105 - media: 'json', 106 - query: [ 107 - 'q="__INPUT__"~100', 108 - 'fq=type:DOCUMENT', 109 - `fq=space:Collabs.*` 110 - ].join('\n'), 111 - input: searchString 112 - }).then(resolve); 113 - //}); 66 + function handleXWikiSearch(space, callback) { 67 + require(['jquery'], function($) { 68 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 69 + const contextSearchButton = document.getElementById("context-search-button"); 70 + const xwikiSpace = space ? `.${space}` : ''; 71 + contextSearchButton.addEventListener('click', function() { 72 + $.post(solrServiceURL, { 73 + outputSyntax: 'plain', 74 + media: 'json', 75 + query: [ 76 + 'q="__INPUT__"~100', 77 + 'fq=type:DOCUMENT', 78 + `fq=space:Collabs${xwikiSpace}.*` 79 + ].join('\n'), 80 + input: $('#context-search-text').val() 81 + }).then(res => { 82 + if(callback) { 83 + callback(res).then(results => { 84 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 85 + }) 86 + } else { 87 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 88 + } 89 + }); 114 114 }); 115 115 }); 116 116 }