Changes for page Context Search
Last modified by bougault on 2023/02/20 16:29
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -8,20 +8,11 @@ 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` 26 26 :host > div { 27 27 padding-bottom: 4em; ... ... @@ -36,6 +36,16 @@ 36 36 a { 37 37 color: var(--color-brand-primary, blue); 38 38 } 30 + .rawResults { 31 + width: 100%; 32 + display: flex; 33 + font-size: 12px; 34 + margin-top: 2em; 35 + } 36 + .rawResults ul { 37 + list-style-type: none; 38 + padding: 0; 39 + } 39 39 `; 40 40 constructor() { 41 41 super(); ... ... @@ -48,7 +48,11 @@ 48 48 this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 49 49 this.results = []; 50 50 this.resultsCache = []; 52 + this.collabFiltersResults = []; 51 51 } 54 + firstUpdated() { 55 + this.renderRoot.getElementById('searchInput').focus(); 56 + } 52 52 toggleRoleFilter(roleName) { 53 53 if(this.rolesFilter.indexOf(roleName) === -1) { 54 54 this.rolesFilter.push(roleName); ... ... @@ -99,7 +99,10 @@ 99 99 fetchFilterSearch() { 100 100 return new Promise((resolve) => { 101 101 if(this.hasActiveFilters()) { 102 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 107 + fetch(this.filterUrl).then(res => res.json()).then((res) => { 108 + this.collabFiltersResults = res; 109 + resolve(res); 110 + }); 103 103 } else { 104 104 resolve([]); 105 105 } ... ... @@ -117,8 +117,7 @@ 117 117 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 118 118 } 119 119 handleKeyPress(e) { 120 - console.log(e.keyCode === 13) { 121 - e.preventDefault() 128 + if (e.keyCode === 13) { 122 122 this.handleSearch(true); 123 123 } 124 124 } ... ... @@ -126,7 +126,7 @@ 126 126 return html` 127 127 <div> 128 128 <div> 129 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress={this.handleKeyPress}/> 136 + <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 130 130 <button @click="${() => this.handleSearch(true)}">Search</button> 131 131 </div> 132 132 <div> ... ... @@ -143,6 +143,16 @@ 143 143 </div> 144 144 `)} 145 145 </div> 153 + <div class="rawResults"> 154 + <div> 155 + <strong>XWiki Search Results</strong> 156 + <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul> 157 + </div> 158 + <div> 159 + <strong>Collab Search Results (Filters)</strong> 160 + <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul> 161 + </div> 162 + </div> 146 146 </div> 147 147 ` 148 148 } ... ... @@ -170,7 +170,5 @@ 170 170 } 171 171 }); 172 172 </script> 173 - 174 174 <clb-unified-search></clb-unified-search> 175 - 176 176 {{/html}}