| ... |
... |
@@ -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,13 @@ |
| 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 }, |
| 19 |
|
- } |
| 20 |
|
- */ |
| 21 |
|
- static properties = { |
| 22 |
22 |
results: { type: Array } |
| 23 |
23 |
} |
| 24 |
24 |
static styles = css` |
|
15 |
+ :host > div { |
|
16 |
+ padding-bottom: 4em; |
|
17 |
+ } |
| 25 |
25 |
.result { |
| 26 |
26 |
margin-top: 1em; |
| 27 |
27 |
} |
| ... |
... |
@@ -45,6 +45,9 @@ |
| 45 |
45 |
this.results = []; |
| 46 |
46 |
this.resultsCache = []; |
| 47 |
47 |
} |
|
41 |
+ firstUpdated() { |
|
42 |
+ this.renderRoot.getElementById('searchInput').focus(); |
|
43 |
+ } |
| 48 |
48 |
toggleRoleFilter(roleName) { |
| 49 |
49 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| 50 |
50 |
this.rolesFilter.push(roleName); |
| ... |
... |
@@ -61,6 +61,7 @@ |
| 61 |
61 |
handleSearch(textSearch) { |
| 62 |
62 |
if(this.searchText !== "" || textSearch) { |
| 63 |
63 |
if(this.searchText !== this.prevSearchText) { |
|
60 |
+ this.clearResults(); |
| 64 |
64 |
this.prevSearchText = this.searchText; |
| 65 |
65 |
this.fetchWikiSearch().then(results => { |
| 66 |
66 |
this.resultsCache = results; |
| ... |
... |
@@ -70,16 +70,6 @@ |
| 70 |
70 |
this.results = results; |
| 71 |
71 |
} |
| 72 |
72 |
}) |
| 73 |
|
- /* |
| 74 |
|
- Promise.all([ |
| 75 |
|
- this.fetchWikiSearch(), |
| 76 |
|
- this.fetchFilterSearch() |
| 77 |
|
- ]).then(([wikiSearchResults, collabSearchResults]) => { |
| 78 |
|
- this.results = wikiSearchResults; |
| 79 |
|
- this.resultsCache = wikiSearchResults; |
| 80 |
|
- console.log(wikiSearchResults, collabSearchResults); |
| 81 |
|
- }); |
| 82 |
|
- */ |
| 83 |
83 |
} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 84 |
84 |
this.fetchFilterSearch().then(this.filterResults) |
| 85 |
85 |
} else { |
| ... |
... |
@@ -121,11 +121,16 @@ |
| 121 |
121 |
getLink(xwikiDocSpace) { |
| 122 |
122 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 123 |
123 |
} |
|
111 |
+ handleKeyPress(e) { |
|
112 |
+ if (e.keyCode === 13) { |
|
113 |
+ this.handleSearch(true); |
|
114 |
+ } |
|
115 |
+ } |
| 124 |
124 |
render() { |
| 125 |
125 |
return html` |
| 126 |
126 |
<div> |
| 127 |
127 |
<div> |
| 128 |
|
- <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> |
|
120 |
+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
| 129 |
129 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 130 |
130 |
</div> |
| 131 |
131 |
<div> |
| ... |
... |
@@ -169,7 +169,5 @@ |
| 169 |
169 |
} |
| 170 |
170 |
}); |
| 171 |
171 |
</script> |
| 172 |
|
- |
| 173 |
173 |
<clb-unified-search></clb-unified-search> |
| 174 |
|
- |
| 175 |
175 |
{{/html}} |