| ... |
... |
@@ -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 |
--> |
| ... |
... |
@@ -27,19 +27,6 @@ |
| 27 |
27 |
a { |
| 28 |
28 |
color: var(--color-brand-primary, blue); |
| 29 |
29 |
} |
| 30 |
|
- .rawResults { |
| 31 |
|
- width: 100%; |
| 32 |
|
- display: flex; |
| 33 |
|
- font-size: 12px; |
| 34 |
|
- margin-top: 2em; |
| 35 |
|
- } |
| 36 |
|
- .rawResults > div { |
| 37 |
|
- width: 100%; |
| 38 |
|
- } |
| 39 |
|
- .rawResults ul { |
| 40 |
|
- list-style-type: none; |
| 41 |
|
- padding: 0; |
| 42 |
|
- } |
| 43 |
43 |
`; |
| 44 |
44 |
constructor() { |
| 45 |
45 |
super(); |
| ... |
... |
@@ -52,7 +52,8 @@ |
| 52 |
52 |
this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); |
| 53 |
53 |
this.results = []; |
| 54 |
54 |
this.resultsCache = []; |
| 55 |
|
- this.collabFiltersResults = []; |
|
42 |
+ this.offset = 0; |
|
43 |
+ this.nb = 10; |
| 56 |
56 |
} |
| 57 |
57 |
firstUpdated() { |
| 58 |
58 |
this.renderRoot.getElementById('searchInput').focus(); |
| ... |
... |
@@ -70,9 +70,15 @@ |
| 70 |
70 |
setSearchText(e) { |
| 71 |
71 |
this.searchText = e.target.value; |
| 72 |
72 |
} |
|
61 |
+ setOffset(e) { |
|
62 |
+ this.offset = e.target.value; |
|
63 |
+ } |
|
64 |
+ setNb(e) { |
|
65 |
+ this.nb = e.target.value; |
|
66 |
+ } |
| 73 |
73 |
handleSearch(textSearch) { |
| 74 |
74 |
if(this.searchText !== "" || textSearch) { |
| 75 |
|
- if(this.searchText !== this.prevSearchText) { |
|
69 |
+ // if(this.searchText !== this.prevSearchText) { |
| 76 |
76 |
this.clearResults(); |
| 77 |
77 |
this.prevSearchText = this.searchText; |
| 78 |
78 |
this.fetchWikiSearch().then(results => { |
| ... |
... |
@@ -83,11 +83,12 @@ |
| 83 |
83 |
this.results = results; |
| 84 |
84 |
} |
| 85 |
85 |
}) |
| 86 |
|
- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
|
80 |
+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 87 |
87 |
this.fetchFilterSearch().then(this.filterResults) |
| 88 |
88 |
} else { |
| 89 |
89 |
this.results = this.resultsCache; |
| 90 |
90 |
} |
|
85 |
+ */ |
| 91 |
91 |
} else { |
| 92 |
92 |
this.clearResults(); |
| 93 |
93 |
console.log("no search text, should return filter search results if any"); |
| ... |
... |
@@ -102,17 +102,13 @@ |
| 102 |
102 |
} |
| 103 |
103 |
fetchWikiSearch() { |
| 104 |
104 |
// request should be built from component, not from "external" dependency. Leave it here like this for POC. |
| 105 |
|
- return handleXWikiSearch(this.searchText); |
|
100 |
+ return handleXWikiSearch(this.searchText, this.offset, this.nb); |
| 106 |
106 |
} |
| 107 |
107 |
fetchFilterSearch() { |
| 108 |
108 |
return new Promise((resolve) => { |
| 109 |
109 |
if(this.hasActiveFilters()) { |
| 110 |
|
- fetch(this.filterUrl).then(res => res.json()).then((res) => { |
| 111 |
|
- this.collabFiltersResults = res; |
| 112 |
|
- resolve(res); |
| 113 |
|
- }); |
|
105 |
+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); |
| 114 |
114 |
} else { |
| 115 |
|
- this.collabFiltersResults = res; |
| 116 |
116 |
resolve([]); |
| 117 |
117 |
} |
| 118 |
118 |
}); |
| ... |
... |
@@ -124,7 +124,6 @@ |
| 124 |
124 |
clearResults() { |
| 125 |
125 |
this.results = []; |
| 126 |
126 |
this.resultsCache = []; |
| 127 |
|
- this.collabFiltersResults = []; |
| 128 |
128 |
} |
| 129 |
129 |
getLink(xwikiDocSpace) { |
| 130 |
130 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| ... |
... |
@@ -139,6 +139,8 @@ |
| 139 |
139 |
<div> |
| 140 |
140 |
<div> |
| 141 |
141 |
<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}" /> |
| 142 |
142 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 143 |
143 |
</div> |
| 144 |
144 |
<div> |
| ... |
... |
@@ -155,30 +155,21 @@ |
| 155 |
155 |
</div> |
| 156 |
156 |
`)} |
| 157 |
157 |
</div> |
| 158 |
|
- <div class="rawResults"> |
| 159 |
|
- <div> |
| 160 |
|
- <strong>XWiki Search Results</strong> |
| 161 |
|
- <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> |
| 162 |
|
- </div> |
| 163 |
|
- <div> |
| 164 |
|
- <strong>Collab Search Results (Filters)</strong> |
| 165 |
|
- <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul> |
| 166 |
|
- </div> |
| 167 |
|
- </div> |
| 168 |
|
-</div> |
| 169 |
169 |
` |
| 170 |
170 |
} |
| 171 |
171 |
} |
| 172 |
172 |
customElements.define('clb-unified-search', UnifiedSearch); |
| 173 |
173 |
|
| 174 |
|
- function handleXWikiSearch(searchString) { |
|
155 |
+ function handleXWikiSearch(searchString, offset, nb) { |
| 175 |
175 |
return new Promise((resolve) => { |
| 176 |
176 |
require(['jquery'], function($) { |
| 177 |
177 |
const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
| 178 |
178 |
//contextSearchButton.addEventListener('click', function() { |
| 179 |
|
- $.post(solrServiceURL, { |
|
160 |
+ $.get(solrServiceURL, { |
| 180 |
180 |
outputSyntax: 'plain', |
| 181 |
181 |
media: 'json', |
|
163 |
+ nb: nb, |
|
164 |
+ offset: offset, |
| 182 |
182 |
query: [ |
| 183 |
183 |
'q="__INPUT__"~100', |
| 184 |
184 |
'fq=type:DOCUMENT', |
| ... |
... |
@@ -192,5 +192,4 @@ |
| 192 |
192 |
} |
| 193 |
193 |
}); |
| 194 |
194 |
</script> |
| 195 |
|
-<clb-unified-search></clb-unified-search> |
| 196 |
|
-{{/html}} |
|
178 |
+<clb-unified-search></clb-unified-search>{{/html}} |