| ... |
... |
@@ -1,5 +1,5 @@ |
| 1 |
|
- |
| 2 |
|
-{{html clean="false"}}<!-- |
|
1 |
+{{html clean="false"}} |
|
2 |
+<!-- |
| 3 |
3 |
!!! POC. Code must be reviewed / optimized and packaged for use in production !!! |
| 4 |
4 |
!!! Many optimisations can be done !!! |
| 5 |
5 |
--> |
| ... |
... |
@@ -27,6 +27,16 @@ |
| 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 ul { |
|
37 |
+ list-style-type: none; |
|
38 |
+ padding: 0; |
|
39 |
+ } |
| 30 |
30 |
`; |
| 31 |
31 |
constructor() { |
| 32 |
32 |
super(); |
| ... |
... |
@@ -39,6 +39,7 @@ |
| 39 |
39 |
this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); |
| 40 |
40 |
this.results = []; |
| 41 |
41 |
this.resultsCache = []; |
|
52 |
+ this.collabFiltersResults = []; |
| 42 |
42 |
} |
| 43 |
43 |
firstUpdated() { |
| 44 |
44 |
this.renderRoot.getElementById('searchInput').focus(); |
| ... |
... |
@@ -93,7 +93,10 @@ |
| 93 |
93 |
fetchFilterSearch() { |
| 94 |
94 |
return new Promise((resolve) => { |
| 95 |
95 |
if(this.hasActiveFilters()) { |
| 96 |
|
- fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); |
|
107 |
+ fetch(this.filterUrl).then(res => res.json()).then((res) => { |
|
108 |
+ this.collabFiltersResults = res; |
|
109 |
+ resolve(res); |
|
110 |
+ }); |
| 97 |
97 |
} else { |
| 98 |
98 |
resolve([]); |
| 99 |
99 |
} |
| ... |
... |
@@ -136,6 +136,17 @@ |
| 136 |
136 |
</div> |
| 137 |
137 |
`)} |
| 138 |
138 |
</div> |
|
153 |
+ <div class="rawResults"> |
|
154 |
+ <div> |
|
155 |
+ <strong>XWiki Search Results</strong> |
|
156 |
+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> |
|
157 |
+ </div> |
|
158 |
+ <div> |
|
159 |
+ <strong>Collab Search Results (Filters)</strong> |
|
160 |
+ <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul> |
|
161 |
+ </div> |
|
162 |
+ </div> |
|
163 |
+</div> |
| 139 |
139 |
` |
| 140 |
140 |
} |
| 141 |
141 |
} |
| ... |
... |
@@ -146,10 +146,9 @@ |
| 146 |
146 |
require(['jquery'], function($) { |
| 147 |
147 |
const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
| 148 |
148 |
//contextSearchButton.addEventListener('click', function() { |
| 149 |
|
- $.get(solrServiceURL, { |
|
174 |
+ $.post(solrServiceURL, { |
| 150 |
150 |
outputSyntax: 'plain', |
| 151 |
151 |
media: 'json', |
| 152 |
|
- nb:1000, |
| 153 |
153 |
query: [ |
| 154 |
154 |
'q="__INPUT__"~100', |
| 155 |
155 |
'fq=type:DOCUMENT', |
| ... |
... |
@@ -163,4 +163,5 @@ |
| 163 |
163 |
} |
| 164 |
164 |
}); |
| 165 |
165 |
</script> |
| 166 |
|
-<clb-unified-search></clb-unified-search>{{/html}} |
|
190 |
+<clb-unified-search></clb-unified-search> |
|
191 |
+{{/html}} |