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,5 +1,5 @@ 1 - {{html clean="false"}}2 -<!-- 1 + 2 +{{html clean="false"}}<!-- 3 3 !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 4 !!! Many optimisations can be done !!! 5 5 --> ... ... @@ -8,20 +8,11 @@ 8 8 window.addEventListener('DOMContentLoaded', function() { 9 9 10 10 class UnifiedSearch extends LitElement { 11 - /* 12 12 static properties = { 13 - searchText: { type: String }, 14 - favoritesFilter: { type: Boolean }, 15 - administratorFilter: { type: Boolean }, 16 - editorFilter: { type: Boolean }, 17 - viewerFilter: { type: Boolean }, 18 - publicFilter: { type: Boolean }, 19 - privateFilter: { type: Boolean }, 12 + results: { type: Array }, 13 + resultsCache: { type: Array }, 14 + collabFiltersResults: { type: Array} 20 20 } 21 - */ 22 - static properties = { 23 - results: { type: Array } 24 - } 25 25 static styles = css` 26 26 :host > div { 27 27 padding-bottom: 4em; ... ... @@ -48,7 +48,12 @@ 48 48 this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 49 49 this.results = []; 50 50 this.resultsCache = []; 42 + this.offset = 0; 43 + this.nb = 10; 51 51 } 45 + firstUpdated() { 46 + this.renderRoot.getElementById('searchInput').focus(); 47 + } 52 52 toggleRoleFilter(roleName) { 53 53 if(this.rolesFilter.indexOf(roleName) === -1) { 54 54 this.rolesFilter.push(roleName); ... ... @@ -62,6 +62,12 @@ 62 62 setSearchText(e) { 63 63 this.searchText = e.target.value; 64 64 } 61 + setOffset(e) { 62 + this.offset = e.target.value; 63 + } 64 + setNb(e) { 65 + this.nb = e.target.value; 66 + } 65 65 handleSearch(textSearch) { 66 66 if(this.searchText !== "" || textSearch) { 67 67 if(this.searchText !== this.prevSearchText) { ... ... @@ -94,12 +94,12 @@ 94 94 } 95 95 fetchWikiSearch() { 96 96 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 97 - return handleXWikiSearch(this.searchText); 99 + return handleXWikiSearch(this.searchText, this.offset, this.nb); 98 98 } 99 99 fetchFilterSearch() { 100 100 return new Promise((resolve) => { 101 101 if(this.hasActiveFilters()) { 102 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 104 + fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); 103 103 } else { 104 104 resolve([]); 105 105 } ... ... @@ -118,7 +118,6 @@ 118 118 } 119 119 handleKeyPress(e) { 120 120 if (e.keyCode === 13) { 121 - console.log('zzz'); 122 122 this.handleSearch(true); 123 123 } 124 124 } ... ... @@ -126,7 +126,9 @@ 126 126 return html` 127 127 <div> 128 128 <div> 129 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 130 + <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 131 + <input @change="${this.setNb}"" type="text" value="${this.nb}" /> 132 + <input @change="${this.setOffset}"" type="text" value="${this.offset}" /> 130 130 <button @click="${() => this.handleSearch(true)}">Search</button> 131 131 </div> 132 132 <div> ... ... @@ -143,7 +143,6 @@ 143 143 </div> 144 144 `)} 145 145 </div> 146 -</div> 147 147 ` 148 148 } 149 149 } ... ... @@ -154,9 +154,11 @@ 154 154 require(['jquery'], function($) { 155 155 const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 156 156 //contextSearchButton.addEventListener('click', function() { 157 - $. post(solrServiceURL, {159 + $.get(solrServiceURL, { 158 158 outputSyntax: 'plain', 159 159 media: 'json', 162 + nb:100, 163 + offset:10, 160 160 query: [ 161 161 'q="__INPUT__"~100', 162 162 'fq=type:DOCUMENT', ... ... @@ -170,7 +170,4 @@ 170 170 } 171 171 }); 172 172 </script> 173 - 174 -<clb-unified-search></clb-unified-search> 175 - 176 -{{/html}} 177 +<clb-unified-search></clb-unified-search>{{/html}}