| ... |
... |
@@ -8,21 +8,15 @@ |
| 8 |
8 |
window.addEventListener('DOMContentLoaded', function() { |
| 9 |
9 |
|
| 10 |
10 |
class UnifiedSearch extends LitElement { |
| 11 |
|
- /* |
| 12 |
12 |
static properties = { |
| 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 }, |
|
12 |
+ results: { type: Array }, |
|
13 |
+ resultsCache: { type: Array }, |
|
14 |
+ collabFiltersResults: { type: Array} |
| 20 |
20 |
} |
| 21 |
|
- */ |
| 22 |
|
- static properties = { |
| 23 |
|
- results: { type: Array } |
| 24 |
|
- } |
| 25 |
25 |
static styles = css` |
|
17 |
+ :host > div { |
|
18 |
+ padding-bottom: 4em; |
|
19 |
+ } |
| 26 |
26 |
.result { |
| 27 |
27 |
margin-top: 1em; |
| 28 |
28 |
} |
| ... |
... |
@@ -33,6 +33,15 @@ |
| 33 |
33 |
a { |
| 34 |
34 |
color: var(--color-brand-primary, blue); |
| 35 |
35 |
} |
|
30 |
+ .rawResults { |
|
31 |
+ width: 100%; |
|
32 |
+ display: flex; |
|
33 |
+ font-size: 12px; |
|
34 |
+ margin-top: 2em; |
|
35 |
+ } |
|
36 |
+ .rawResults pre { |
|
37 |
+ overflow: scroll; |
|
38 |
+ } |
| 36 |
36 |
`; |
| 37 |
37 |
constructor() { |
| 38 |
38 |
super(); |
| ... |
... |
@@ -45,7 +45,11 @@ |
| 45 |
45 |
this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); |
| 46 |
46 |
this.results = []; |
| 47 |
47 |
this.resultsCache = []; |
|
51 |
+ this.collabFiltersResults = []; |
| 48 |
48 |
} |
|
53 |
+ firstUpdated() { |
|
54 |
+ this.renderRoot.getElementById('searchInput').focus(); |
|
55 |
+ } |
| 49 |
49 |
toggleRoleFilter(roleName) { |
| 50 |
50 |
if(this.rolesFilter.indexOf(roleName) === -1) { |
| 51 |
51 |
this.rolesFilter.push(roleName); |
| ... |
... |
@@ -96,7 +96,10 @@ |
| 96 |
96 |
fetchFilterSearch() { |
| 97 |
97 |
return new Promise((resolve) => { |
| 98 |
98 |
if(this.hasActiveFilters()) { |
| 99 |
|
- fetch(this.filterUrl).then(res => res.json()).then(resolve); |
|
106 |
+ fetch(this.filterUrl).then(res => res.json()).then((res) => { |
|
107 |
+ this.collabFiltersResults = res; |
|
108 |
+ resolve(res); |
|
109 |
+ }); |
| 100 |
100 |
} else { |
| 101 |
101 |
resolve([]); |
| 102 |
102 |
} |
| ... |
... |
@@ -113,11 +113,16 @@ |
| 113 |
113 |
getLink(xwikiDocSpace) { |
| 114 |
114 |
return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 115 |
115 |
} |
|
126 |
+ handleKeyPress(e) { |
|
127 |
+ if (e.keyCode === 13) { |
|
128 |
+ this.handleSearch(true); |
|
129 |
+ } |
|
130 |
+ } |
| 116 |
116 |
render() { |
| 117 |
117 |
return html` |
| 118 |
118 |
<div> |
| 119 |
119 |
<div> |
| 120 |
|
- <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> |
|
135 |
+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> |
| 121 |
121 |
<button @click="${() => this.handleSearch(true)}">Search</button> |
| 122 |
122 |
</div> |
| 123 |
123 |
<div> |
| ... |
... |
@@ -134,6 +134,16 @@ |
| 134 |
134 |
</div> |
| 135 |
135 |
`)} |
| 136 |
136 |
</div> |
|
152 |
+ <div class="rawResults"> |
|
153 |
+ <div> |
|
154 |
+ <strong>XWiki Search Results</strong> |
|
155 |
+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> |
|
156 |
+ </div> |
|
157 |
+ <div> |
|
158 |
+ <strong>Collab Search Results (Filters)</strong> |
|
159 |
+ <pre>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</pre> |
|
160 |
+ </div> |
|
161 |
+ </div> |
| 137 |
137 |
</div> |
| 138 |
138 |
` |
| 139 |
139 |
} |
| ... |
... |
@@ -161,7 +161,5 @@ |
| 161 |
161 |
} |
| 162 |
162 |
}); |
| 163 |
163 |
</script> |
| 164 |
|
- |
| 165 |
165 |
<clb-unified-search></clb-unified-search> |
| 166 |
|
- |
| 167 |
167 |
{{/html}} |