| ... |
... |
@@ -1,6 +1,7 @@ |
| 1 |
1 |
{{html clean="false"}} |
| 2 |
2 |
<!-- |
| 3 |
|
- !!! POC. Code must be reviewed / optimized and packaged for use in production !!! |
|
3 |
+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!! |
|
4 |
+ !!! Many optimisations can be done !!! |
| 4 |
4 |
--> |
| 5 |
5 |
<script type="module"> |
| 6 |
6 |
import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; |
| ... |
... |
@@ -7,21 +7,15 @@ |
| 7 |
7 |
window.addEventListener('DOMContentLoaded', function() { |
| 8 |
8 |
|
| 9 |
9 |
class UnifiedSearch extends LitElement { |
| 10 |
|
- /* |
| 11 |
11 |
static properties = { |
| 12 |
|
- searchText: { type: String }, |
| 13 |
|
- favoritesFilter: { type: Boolean }, |
| 14 |
|
- administratorFilter: { type: Boolean }, |
| 15 |
|
- editorFilter: { type: Boolean }, |
| 16 |
|
- viewerFilter: { type: Boolean }, |
| 17 |
|
- publicFilter: { type: Boolean }, |
| 18 |
|
- privateFilter: { type: Boolean }, |
|
12 |
+ results: { type: Array }, |
|
13 |
+ resultsCache: { type: Array }, |
|
14 |
+ collabFiltersResults: { type: Array} |
| 19 |
19 |
} |
| 20 |
|
- */ |
| 21 |
|
- static properties = { |
| 22 |
|
- results: { type: Array } |
| 23 |
|
- } |
| 24 |
24 |
static styles = css` |
|
17 |
+ :host > div { |
|
18 |
+ padding-bottom: 4em; |
|
19 |
+ } |
| 25 |
25 |
.result { |
| 26 |
26 |
margin-top: 1em; |
| 27 |
27 |
} |
| ... |
... |
@@ -45,6 +45,9 @@ |
| 45 |
45 |
this.results = []; |
| 46 |
46 |
this.resultsCache = []; |
| 47 |
47 |
} |
|
43 |
+ firstUpdated() { |
|
44 |
+ this.renderRoot.getElementById('searchInput').focus(); |
|
45 |
+ } |
| 48 |
48 |
toggleRoleFilter(roleName) { |
| 49 |
49 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| 50 |
50 |
this.rolesFilter.push(roleName); |
| ... |
... |
@@ -95,7 +95,10 @@ |
| 95 |
95 |
fetchFilterSearch() { |
| 96 |
96 |
return new Promise((resolve) => { |
| 97 |
97 |
if(this.hasActiveFilters()) { |
| 98 |
|
- fetch(this.filterUrl).then(res => res.json()).then(resolve); |
|
96 |
+ fetch(this.filterUrl).then(res => res.json()).then((res) => { |
|
97 |
+ this.collabFiltersResults = res; |
|
98 |
+ resolve(res); |
|
99 |
+ }); |
| 99 |
99 |
} else { |
| 100 |
100 |
resolve([]); |
| 101 |
101 |
} |
| ... |
... |
@@ -112,11 +112,16 @@ |
| 112 |
112 |
getLink(xwikiDocSpace) { |
| 113 |
113 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 114 |
114 |
} |
|
116 |
+ handleKeyPress(e) { |
|
117 |
+ if (e.keyCode === 13) { |
|
118 |
+ this.handleSearch(true); |
|
119 |
+ } |
|
120 |
+ } |
| 115 |
115 |
render() { |
| 116 |
116 |
return html` |
| 117 |
117 |
<div> |
| 118 |
118 |
<div> |
| 119 |
|
- <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> |
|
125 |
+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
| 120 |
120 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 121 |
121 |
</div> |
| 122 |
122 |
<div> |
| ... |
... |
@@ -133,6 +133,16 @@ |
| 133 |
133 |
</div> |
| 134 |
134 |
`)} |
| 135 |
135 |
</div> |
|
142 |
+ <div class="rawResults"> |
|
143 |
+ <div> |
|
144 |
+ <strong>XWiki Search Results</strong> |
|
145 |
+ <pre>${this.resultsCache}</pre> |
|
146 |
+ </div> |
|
147 |
+ <div> |
|
148 |
+ <strong>Collab Search Results (Filters)</strong> |
|
149 |
+ <pre>${this.collabFiltersResults}</pre> |
|
150 |
+ </div> |
|
151 |
+ </div> |
| 136 |
136 |
</div> |
| 137 |
137 |
` |
| 138 |
138 |
} |
| ... |
... |
@@ -160,7 +160,5 @@ |
| 160 |
160 |
} |
| 161 |
161 |
}); |
| 162 |
162 |
</script> |
| 163 |
|
- |
| 164 |
164 |
<clb-unified-search></clb-unified-search> |
| 165 |
|
- |
| 166 |
166 |
{{/html}} |