| ... |
... |
@@ -8,11 +8,20 @@ |
| 8 |
8 |
window.addEventListener('DOMContentLoaded', function() { |
| 9 |
9 |
|
| 10 |
10 |
class UnifiedSearch extends LitElement { |
|
11 |
+ /* |
| 11 |
11 |
static properties = { |
| 12 |
|
- results: { type: Array }, |
| 13 |
|
- resultsCache: { type: Array }, |
| 14 |
|
- collabFiltersResults: { type: Array} |
|
13 |
+ searchText: { type: String }, |
|
14 |
+ favoritesFilter: { type: Boolean }, |
|
15 |
+ administratorFilter: { type: Boolean }, |
|
16 |
+ editorFilter: { type: Boolean }, |
|
17 |
+ viewerFilter: { type: Boolean }, |
|
18 |
+ publicFilter: { type: Boolean }, |
|
19 |
+ privateFilter: { type: Boolean }, |
| 15 |
15 |
} |
|
21 |
+ */ |
|
22 |
+ static properties = { |
|
23 |
+ results: { type: Array } |
|
24 |
+ } |
| 16 |
16 |
static styles = css` |
| 17 |
17 |
:host > div { |
| 18 |
18 |
padding-bottom: 4em; |
| ... |
... |
@@ -27,15 +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 pre { |
| 37 |
|
- overflow: scroll; |
| 38 |
|
- } |
| 39 |
39 |
`; |
| 40 |
40 |
constructor() { |
| 41 |
41 |
super(); |
| ... |
... |
@@ -49,9 +49,6 @@ |
| 49 |
49 |
this.results = []; |
| 50 |
50 |
this.resultsCache = []; |
| 51 |
51 |
} |
| 52 |
|
- firstUpdated() { |
| 53 |
|
- this.renderRoot.getElementById('searchInput').focus(); |
| 54 |
|
- } |
| 55 |
55 |
toggleRoleFilter(roleName) { |
| 56 |
56 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| 57 |
57 |
this.rolesFilter.push(roleName); |
| ... |
... |
@@ -102,10 +102,7 @@ |
| 102 |
102 |
fetchFilterSearch() { |
| 103 |
103 |
return new Promise((resolve) => { |
| 104 |
104 |
if(this.hasActiveFilters()) { |
| 105 |
|
- fetch(this.filterUrl).then(res => res.json()).then((res) => { |
| 106 |
|
- this.collabFiltersResults = res; |
| 107 |
|
- resolve(res); |
| 108 |
|
- }); |
|
102 |
+ fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 109 |
109 |
} else { |
| 110 |
110 |
resolve([]); |
| 111 |
111 |
} |
| ... |
... |
@@ -122,16 +122,11 @@ |
| 122 |
122 |
getLink(xwikiDocSpace) { |
| 123 |
123 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 124 |
124 |
} |
| 125 |
|
- handleKeyPress(e) { |
| 126 |
|
- if (e.keyCode === 13) { |
| 127 |
|
- this.handleSearch(true); |
| 128 |
|
- } |
| 129 |
|
- } |
| 130 |
130 |
render() { |
| 131 |
131 |
return html` |
| 132 |
132 |
<div> |
| 133 |
133 |
<div> |
| 134 |
|
- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
|
123 |
+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> |
| 135 |
135 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 136 |
136 |
</div> |
| 137 |
137 |
<div> |
| ... |
... |
@@ -148,16 +148,6 @@ |
| 148 |
148 |
</div> |
| 149 |
149 |
`)} |
| 150 |
150 |
</div> |
| 151 |
|
- <div class="rawResults"> |
| 152 |
|
- <div> |
| 153 |
|
- <strong>XWiki Search Results</strong> |
| 154 |
|
- <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre> |
| 155 |
|
- </div> |
| 156 |
|
- <div> |
| 157 |
|
- <strong>Collab Search Results (Filters)</strong> |
| 158 |
|
- <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre> |
| 159 |
|
- </div> |
| 160 |
|
- </div> |
| 161 |
161 |
</div> |
| 162 |
162 |
` |
| 163 |
163 |
} |
| ... |
... |
@@ -185,5 +185,7 @@ |
| 185 |
185 |
} |
| 186 |
186 |
}); |
| 187 |
187 |
</script> |
|
167 |
+ |
| 188 |
188 |
<clb-unified-search></clb-unified-search> |
|
169 |
+ |
| 189 |
189 |
{{/html}} |