| ... |
... |
@@ -1,7 +1,6 @@ |
| 1 |
1 |
{{html clean="false"}} |
| 2 |
2 |
<!-- |
| 3 |
|
- !!! POC. Code must be reviewed / optimized and packaged for use in production !!! |
| 4 |
|
- !!! Many optimisations can be done !!! |
|
3 |
+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!! |
| 5 |
5 |
--> |
| 6 |
6 |
<script type="module"> |
| 7 |
7 |
import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; |
| ... |
... |
@@ -8,13 +8,21 @@ |
| 8 |
8 |
window.addEventListener('DOMContentLoaded', function() { |
| 9 |
9 |
|
| 10 |
10 |
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 = { |
| 12 |
12 |
results: { type: Array } |
| 13 |
13 |
} |
| 14 |
14 |
static styles = css` |
| 15 |
|
- :host > div { |
| 16 |
|
- padding-bottom: 4em; |
| 17 |
|
- } |
| 18 |
18 |
.result { |
| 19 |
19 |
margin-top: 1em; |
| 20 |
20 |
} |
| ... |
... |
@@ -38,9 +38,6 @@ |
| 38 |
38 |
this.results = []; |
| 39 |
39 |
this.resultsCache = []; |
| 40 |
40 |
} |
| 41 |
|
- firstUpdated() { |
| 42 |
|
- this.renderRoot.getElementById('searchInput').focus(); |
| 43 |
|
- } |
| 44 |
44 |
toggleRoleFilter(roleName) { |
| 45 |
45 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| 46 |
46 |
this.rolesFilter.push(roleName); |
| ... |
... |
@@ -60,6 +60,7 @@ |
| 60 |
60 |
this.clearResults(); |
| 61 |
61 |
this.prevSearchText = this.searchText; |
| 62 |
62 |
this.fetchWikiSearch().then(results => { |
|
67 |
+ console.log(results); |
| 63 |
63 |
this.resultsCache = results; |
| 64 |
64 |
if(this.hasActiveFilters()) { |
| 65 |
65 |
this.fetchFilterSearch().then(this.filterResults); |
| ... |
... |
@@ -67,6 +67,16 @@ |
| 67 |
67 |
this.results = results; |
| 68 |
68 |
} |
| 69 |
69 |
}) |
|
75 |
+ /* |
|
76 |
+ Promise.all([ |
|
77 |
+ this.fetchWikiSearch(), |
|
78 |
+ this.fetchFilterSearch() |
|
79 |
+ ]).then(([wikiSearchResults, collabSearchResults]) => { |
|
80 |
+ this.results = wikiSearchResults; |
|
81 |
+ this.resultsCache = wikiSearchResults; |
|
82 |
+ console.log(wikiSearchResults, collabSearchResults); |
|
83 |
+ }); |
|
84 |
+ */ |
| 70 |
70 |
} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 71 |
71 |
this.fetchFilterSearch().then(this.filterResults) |
| 72 |
72 |
} else { |
| ... |
... |
@@ -108,16 +108,11 @@ |
| 108 |
108 |
getLink(xwikiDocSpace) { |
| 109 |
109 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 110 |
110 |
} |
| 111 |
|
- handleKeyPress(e) { |
| 112 |
|
- if (e.keyCode === 13) { |
| 113 |
|
- this.handleSearch(true); |
| 114 |
|
- } |
| 115 |
|
- } |
| 116 |
116 |
render() { |
| 117 |
117 |
return html` |
| 118 |
118 |
<div> |
| 119 |
119 |
<div> |
| 120 |
|
- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
|
130 |
+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> |
| 121 |
121 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 122 |
122 |
</div> |
| 123 |
123 |
<div> |
| ... |
... |
@@ -161,5 +161,7 @@ |
| 161 |
161 |
} |
| 162 |
162 |
}); |
| 163 |
163 |
</script> |
|
174 |
+ |
| 164 |
164 |
<clb-unified-search></clb-unified-search> |
|
176 |
+ |
| 165 |
165 |
{{/html}} |