| ... |
... |
@@ -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,24 +62,31 @@ |
| 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 |
|
- if(this.searchText !== this.prevSearchText) { |
|
69 |
+ // if(this.searchText !== this.prevSearchText) { |
| 68 |
68 |
this.clearResults(); |
| 69 |
69 |
this.prevSearchText = this.searchText; |
| 70 |
70 |
this.fetchWikiSearch().then(results => { |
| 71 |
|
- this.resultsCache = results; |
|
73 |
+ //this.resultsCache = results; |
| 72 |
72 |
if(this.hasActiveFilters()) { |
| 73 |
73 |
this.fetchFilterSearch().then(this.filterResults); |
| 74 |
74 |
} else { |
| 75 |
|
- this.results = results; |
|
77 |
+ this.results = results ? results : []; |
| 76 |
76 |
} |
| 77 |
77 |
}) |
| 78 |
|
- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
|
80 |
+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 79 |
79 |
this.fetchFilterSearch().then(this.filterResults) |
| 80 |
80 |
} else { |
| 81 |
81 |
this.results = this.resultsCache; |
| 82 |
82 |
} |
|
85 |
+ */ |
| 83 |
83 |
} else { |
| 84 |
84 |
this.clearResults(); |
| 85 |
85 |
console.log("no search text, should return filter search results if any"); |
| ... |
... |
@@ -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); |
|
100 |
+ 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); |
|
105 |
+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); |
| 103 |
103 |
} else { |
| 104 |
104 |
resolve([]); |
| 105 |
105 |
} |
| ... |
... |
@@ -125,7 +125,9 @@ |
| 125 |
125 |
return html` |
| 126 |
126 |
<div> |
| 127 |
127 |
<div> |
| 128 |
|
- <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
|
131 |
+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
|
132 |
+ <input @change="${this.setNb}"" type="text" value="${this.nb}" /> |
|
133 |
+ <input @change="${this.setOffset}"" type="text" value="${this.offset}" /> |
| 129 |
129 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 130 |
130 |
</div> |
| 131 |
131 |
<div> |
| ... |
... |
@@ -142,20 +142,21 @@ |
| 142 |
142 |
</div> |
| 143 |
143 |
`)} |
| 144 |
144 |
</div> |
| 145 |
|
-</div> |
| 146 |
146 |
` |
| 147 |
147 |
} |
| 148 |
148 |
} |
| 149 |
149 |
customElements.define('clb-unified-search', UnifiedSearch); |
| 150 |
150 |
|
| 151 |
|
- function handleXWikiSearch(searchString) { |
|
155 |
+ function handleXWikiSearch(searchString, offset, nb) { |
| 152 |
152 |
return new Promise((resolve) => { |
| 153 |
153 |
require(['jquery'], function($) { |
| 154 |
154 |
const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
| 155 |
155 |
//contextSearchButton.addEventListener('click', function() { |
| 156 |
|
- $.post(solrServiceURL, { |
|
160 |
+ $.get(solrServiceURL, { |
| 157 |
157 |
outputSyntax: 'plain', |
| 158 |
158 |
media: 'json', |
|
163 |
+ nb: nb, |
|
164 |
+ offset: offset, |
| 159 |
159 |
query: [ |
| 160 |
160 |
'q="__INPUT__"~100', |
| 161 |
161 |
'fq=type:DOCUMENT', |
| ... |
... |
@@ -169,7 +169,4 @@ |
| 169 |
169 |
} |
| 170 |
170 |
}); |
| 171 |
171 |
</script> |
| 172 |
|
- |
| 173 |
|
-<clb-unified-search></clb-unified-search> |
| 174 |
|
- |
| 175 |
|
-{{/html}} |
|
178 |
+<clb-unified-search></clb-unified-search>{{/html}} |