| ... |
... |
@@ -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 |
--> |
| ... |
... |
@@ -9,7 +9,9 @@ |
| 9 |
9 |
|
| 10 |
10 |
class UnifiedSearch extends LitElement { |
| 11 |
11 |
static properties = { |
| 12 |
|
- results: { type: Array } |
|
12 |
+ results: { type: Array }, |
|
13 |
+ resultsCache: { type: Array }, |
|
14 |
+ collabFiltersResults: { type: Array} |
| 13 |
13 |
} |
| 14 |
14 |
static styles = css` |
| 15 |
15 |
:host > div { |
| ... |
... |
@@ -37,6 +37,8 @@ |
| 37 |
37 |
this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); |
| 38 |
38 |
this.results = []; |
| 39 |
39 |
this.resultsCache = []; |
|
42 |
+ this.offset = 0; |
|
43 |
+ this.nb = 10; |
| 40 |
40 |
} |
| 41 |
41 |
firstUpdated() { |
| 42 |
42 |
this.renderRoot.getElementById('searchInput').focus(); |
| ... |
... |
@@ -54,6 +54,12 @@ |
| 54 |
54 |
setSearchText(e) { |
| 55 |
55 |
this.searchText = e.target.value; |
| 56 |
56 |
} |
|
61 |
+ setOffset(e) { |
|
62 |
+ this.offset = e.target.value; |
|
63 |
+ } |
|
64 |
+ setNb(e) { |
|
65 |
+ this.nb = e.target.value; |
|
66 |
+ } |
| 57 |
57 |
handleSearch(textSearch) { |
| 58 |
58 |
if(this.searchText !== "" || textSearch) { |
| 59 |
59 |
if(this.searchText !== this.prevSearchText) { |
| ... |
... |
@@ -86,12 +86,12 @@ |
| 86 |
86 |
} |
| 87 |
87 |
fetchWikiSearch() { |
| 88 |
88 |
// request should be built from component, not from "external" dependency. Leave it here like this for POC. |
| 89 |
|
- return handleXWikiSearch(this.searchText); |
|
99 |
+ return handleXWikiSearch(this.searchText, this.offset, this.nb); |
| 90 |
90 |
} |
| 91 |
91 |
fetchFilterSearch() { |
| 92 |
92 |
return new Promise((resolve) => { |
| 93 |
93 |
if(this.hasActiveFilters()) { |
| 94 |
|
- fetch(this.filterUrl).then(res => res.json()).then(resolve); |
|
104 |
+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); |
| 95 |
95 |
} else { |
| 96 |
96 |
resolve([]); |
| 97 |
97 |
} |
| ... |
... |
@@ -118,6 +118,8 @@ |
| 118 |
118 |
<div> |
| 119 |
119 |
<div> |
| 120 |
120 |
<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}" /> |
| 121 |
121 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 122 |
122 |
</div> |
| 123 |
123 |
<div> |
| ... |
... |
@@ -134,20 +134,21 @@ |
| 134 |
134 |
</div> |
| 135 |
135 |
`)} |
| 136 |
136 |
</div> |
| 137 |
|
-</div> |
| 138 |
138 |
` |
| 139 |
139 |
} |
| 140 |
140 |
} |
| 141 |
141 |
customElements.define('clb-unified-search', UnifiedSearch); |
| 142 |
142 |
|
| 143 |
|
- function handleXWikiSearch(searchString) { |
|
154 |
+ function handleXWikiSearch(searchString, offset, nb) { |
| 144 |
144 |
return new Promise((resolve) => { |
| 145 |
145 |
require(['jquery'], function($) { |
| 146 |
146 |
const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
| 147 |
147 |
//contextSearchButton.addEventListener('click', function() { |
| 148 |
|
- $.post(solrServiceURL, { |
|
159 |
+ $.get(solrServiceURL, { |
| 149 |
149 |
outputSyntax: 'plain', |
| 150 |
150 |
media: 'json', |
|
162 |
+ nb: nb, |
|
163 |
+ offset: offset, |
| 151 |
151 |
query: [ |
| 152 |
152 |
'q="__INPUT__"~100', |
| 153 |
153 |
'fq=type:DOCUMENT', |
| ... |
... |
@@ -161,5 +161,4 @@ |
| 161 |
161 |
} |
| 162 |
162 |
}); |
| 163 |
163 |
</script> |
| 164 |
|
-<clb-unified-search></clb-unified-search> |
| 165 |
|
-{{/html}} |
|
177 |
+<clb-unified-search></clb-unified-search>{{/html}} |