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
-
... ... @@ -1,7 +1,6 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 - !!! Many optimisations can be done !!! 3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 5 5 --> 6 6 <script type="module"> 7 7 import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; ... ... @@ -8,15 +8,21 @@ 8 8 window.addEventListener('DOMContentLoaded', function() { 9 9 10 10 class UnifiedSearch extends LitElement { 10 + /* 11 11 static properties = { 12 - results: { type: Array }, 13 - resultsCache: { type: Array }, 14 - collabFiltersResults: { type: Array} 12 + searchText: { type: String }, 13 + favoritesFilter: { type: Boolean }, 14 + administratorFilter: { type: Boolean }, 15 + editorFilter: { type: Boolean }, 16 + viewerFilter: { type: Boolean }, 17 + publicFilter: { type: Boolean }, 18 + privateFilter: { type: Boolean }, 15 15 } 20 + */ 21 + static properties = { 22 + results: { type: Array } 23 + } 16 16 static styles = css` 17 - :host > div { 18 - padding-bottom: 4em; 19 - } 20 20 .result { 21 21 margin-top: 1em; 22 22 } ... ... @@ -27,12 +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 36 `; 37 37 constructor() { 38 38 super(); ... ... @@ -46,9 +46,6 @@ 46 46 this.results = []; 47 47 this.resultsCache = []; 48 48 } 49 - firstUpdated() { 50 - this.renderRoot.getElementById('searchInput').focus(); 51 - } 52 52 toggleRoleFilter(roleName) { 53 53 if(this.rolesFilter.indexOf(roleName) === -1) { 54 54 this.rolesFilter.push(roleName); ... ... @@ -99,10 +99,7 @@ 99 99 fetchFilterSearch() { 100 100 return new Promise((resolve) => { 101 101 if(this.hasActiveFilters()) { 102 - fetch(this.filterUrl).then(res => res.json()).then((res) => { 103 - this.collabFiltersResults = res; 104 - resolve(res); 105 - }); 98 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 106 106 } else { 107 107 resolve([]); 108 108 } ... ... @@ -119,16 +119,11 @@ 119 119 getLink(xwikiDocSpace) { 120 120 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 121 121 } 122 - handleKeyPress(e) { 123 - if (e.keyCode === 13) { 124 - this.handleSearch(true); 125 - } 126 - } 127 127 render() { 128 128 return html` 129 129 <div> 130 130 <div> 131 - <input id="searchInput"@change="${this.setSearchText}" type="text" placeholder="Search..."@keypress="${this.handleKeyPress}"/>119 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 132 132 <button @click="${() => this.handleSearch(true)}">Search</button> 133 133 </div> 134 134 <div> ... ... @@ -145,16 +145,6 @@ 145 145 </div> 146 146 `)} 147 147 </div> 148 - <div class="rawResults"> 149 - <div> 150 - <strong>XWiki Search Results</strong> 151 - <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre> 152 - </div> 153 - <div> 154 - <strong>Collab Search Results (Filters)</strong> 155 - <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre> 156 - </div> 157 - </div> 158 158 </div> 159 159 ` 160 160 } ... ... @@ -182,5 +182,7 @@ 182 182 } 183 183 }); 184 184 </script> 163 + 185 185 <clb-unified-search></clb-unified-search> 165 + 186 186 {{/html}}