| ... |
... |
@@ -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,19 +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 > div { |
| 37 |
|
- width: 100%; |
| 38 |
|
- } |
| 39 |
|
- .rawResults ul { |
| 40 |
|
- list-style-type: none; |
| 41 |
|
- padding: 0; |
| 42 |
|
- } |
| 43 |
43 |
`; |
| 44 |
44 |
constructor() { |
| 45 |
45 |
super(); |
| ... |
... |
@@ -52,7 +52,6 @@ |
| 52 |
52 |
this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); |
| 53 |
53 |
this.results = []; |
| 54 |
54 |
this.resultsCache = []; |
| 55 |
|
- this.collabFiltersResults = []; |
| 56 |
56 |
} |
| 57 |
57 |
firstUpdated() { |
| 58 |
58 |
this.renderRoot.getElementById('searchInput').focus(); |
| ... |
... |
@@ -107,10 +107,7 @@ |
| 107 |
107 |
fetchFilterSearch() { |
| 108 |
108 |
return new Promise((resolve) => { |
| 109 |
109 |
if(this.hasActiveFilters()) { |
| 110 |
|
- fetch(this.filterUrl).then(res => res.json()).then((res) => { |
| 111 |
|
- this.collabFiltersResults = res; |
| 112 |
|
- resolve(res); |
| 113 |
|
- }); |
|
105 |
+ fetch(this.filterUrl).then(res => res.json()).then(resolve); |
| 114 |
114 |
} else { |
| 115 |
115 |
resolve([]); |
| 116 |
116 |
} |
| ... |
... |
@@ -153,16 +153,6 @@ |
| 153 |
153 |
</div> |
| 154 |
154 |
`)} |
| 155 |
155 |
</div> |
| 156 |
|
- <div class="rawResults"> |
| 157 |
|
- <div> |
| 158 |
|
- <strong>XWiki Search Results</strong> |
| 159 |
|
- <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> |
| 160 |
|
- </div> |
| 161 |
|
- <div> |
| 162 |
|
- <strong>Collab Search Results (Filters)</strong> |
| 163 |
|
- <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul> |
| 164 |
|
- </div> |
| 165 |
|
- </div> |
| 166 |
166 |
</div> |
| 167 |
167 |
` |
| 168 |
168 |
} |
| ... |
... |
@@ -190,5 +190,7 @@ |
| 190 |
190 |
} |
| 191 |
191 |
}); |
| 192 |
192 |
</script> |
|
175 |
+ |
| 193 |
193 |
<clb-unified-search></clb-unified-search> |
|
177 |
+ |
| 194 |
194 |
{{/html}} |