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,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(); ... ... @@ -48,11 +48,7 @@ 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 = []; 51 - this.collabFiltersResults = []; 52 52 } 53 - firstUpdated() { 54 - this.renderRoot.getElementById('searchInput').focus(); 55 - } 56 56 toggleRoleFilter(roleName) { 57 57 if(this.rolesFilter.indexOf(roleName) === -1) { 58 58 this.rolesFilter.push(roleName); ... ... @@ -103,10 +103,7 @@ 103 103 fetchFilterSearch() { 104 104 return new Promise((resolve) => { 105 105 if(this.hasActiveFilters()) { 106 - fetch(this.filterUrl).then(res => res.json()).then((res) => { 107 - this.collabFiltersResults = res; 108 - resolve(res); 109 - }); 102 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 110 110 } else { 111 111 resolve([]); 112 112 } ... ... @@ -123,16 +123,11 @@ 123 123 getLink(xwikiDocSpace) { 124 124 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 125 125 } 126 - handleKeyPress(e) { 127 - if (e.keyCode === 13) { 128 - this.handleSearch(true); 129 - } 130 - } 131 131 render() { 132 132 return html` 133 133 <div> 134 134 <div> 135 - <input id="searchInput"@change="${this.setSearchText}" type="text" placeholder="Search..."@keypress="${this.handleKeyPress}"/>123 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 136 136 <button @click="${() => this.handleSearch(true)}">Search</button> 137 137 </div> 138 138 <div> ... ... @@ -149,16 +149,6 @@ 149 149 </div> 150 150 `)} 151 151 </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> 162 162 </div> 163 163 ` 164 164 } ... ... @@ -186,5 +186,7 @@ 186 186 } 187 187 }); 188 188 </script> 167 + 189 189 <clb-unified-search></clb-unified-search> 169 + 190 190 {{/html}}