| ... |
... |
@@ -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; |
| ... |
... |
@@ -40,9 +40,6 @@ |
| 40 |
40 |
this.results = []; |
| 41 |
41 |
this.resultsCache = []; |
| 42 |
42 |
} |
| 43 |
|
- firstUpdated() { |
| 44 |
|
- this.renderRoot.getElementById('searchInput').focus(); |
| 45 |
|
- } |
| 46 |
46 |
toggleRoleFilter(roleName) { |
| 47 |
47 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| 48 |
48 |
this.rolesFilter.push(roleName); |
| ... |
... |
@@ -93,10 +93,7 @@ |
| 93 |
93 |
fetchFilterSearch() { |
| 94 |
94 |
return new Promise((resolve) => { |
| 95 |
95 |
if(this.hasActiveFilters()) { |
| 96 |
|
- fetch(this.filterUrl).then(res => res.json()).then((res) => { |
| 97 |
|
- this.collabFiltersResults = res; |
| 98 |
|
- resolve(res); |
| 99 |
|
- }); |
|
102 |
+ fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 100 |
100 |
} else { |
| 101 |
101 |
resolve([]); |
| 102 |
102 |
} |
| ... |
... |
@@ -115,6 +115,7 @@ |
| 115 |
115 |
} |
| 116 |
116 |
handleKeyPress(e) { |
| 117 |
117 |
if (e.keyCode === 13) { |
|
121 |
+ console.log('zzz'); |
| 118 |
118 |
this.handleSearch(true); |
| 119 |
119 |
} |
| 120 |
120 |
} |
| ... |
... |
@@ -122,7 +122,7 @@ |
| 122 |
122 |
return html` |
| 123 |
123 |
<div> |
| 124 |
124 |
<div> |
| 125 |
|
- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
|
129 |
+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
| 126 |
126 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 127 |
127 |
</div> |
| 128 |
128 |
<div> |
| ... |
... |
@@ -139,16 +139,6 @@ |
| 139 |
139 |
</div> |
| 140 |
140 |
`)} |
| 141 |
141 |
</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> |
| 152 |
152 |
</div> |
| 153 |
153 |
` |
| 154 |
154 |
} |
| ... |
... |
@@ -176,5 +176,7 @@ |
| 176 |
176 |
} |
| 177 |
177 |
}); |
| 178 |
178 |
</script> |
|
173 |
+ |
| 179 |
179 |
<clb-unified-search></clb-unified-search> |
|
175 |
+ |
| 180 |
180 |
{{/html}} |