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,5 +1,5 @@ 1 - {{html clean="false"}}2 -<!-- 1 + 2 +{{html clean="false"}}<!-- 3 3 !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 4 !!! Many optimisations can be done !!! 5 5 --> ... ... @@ -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,8 @@ 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 = []; 42 + this.offset = 0; 43 + this.nb = 10; 56 56 } 57 57 firstUpdated() { 58 58 this.renderRoot.getElementById('searchInput').focus(); ... ... @@ -70,25 +70,35 @@ 70 70 setSearchText(e) { 71 71 this.searchText = e.target.value; 72 72 } 61 + setOffset(e) { 62 + this.offset = e.target.value; 63 + } 64 + setNb(e) { 65 + this.nb = e.target.value; 66 + } 73 73 handleSearch(textSearch) { 68 + console.log(textSearch); 74 74 if(this.searchText !== "" || textSearch) { 75 - if(this.searchText !== this.prevSearchText) { 70 + // if(this.searchText !== this.prevSearchText) { 76 76 this.clearResults(); 77 77 this.prevSearchText = this.searchText; 78 78 this.fetchWikiSearch().then(results => { 79 - this.resultsCache = results; 74 + console.log('results', results); 75 + //this.resultsCache = results; 80 80 if(this.hasActiveFilters()) { 81 81 this.fetchFilterSearch().then(this.filterResults); 82 82 } else { 83 - this.results = results; 79 + this.results = results ? results : []; 84 84 } 85 85 }) 86 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 82 + /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 87 87 this.fetchFilterSearch().then(this.filterResults) 88 88 } else { 89 89 this.results = this.resultsCache; 90 90 } 87 + */ 91 91 } else { 89 + this.results = []; 92 92 this.clearResults(); 93 93 console.log("no search text, should return filter search results if any"); 94 94 this.fetchFilterSearch().then(collabs => { ... ... @@ -102,15 +102,12 @@ 102 102 } 103 103 fetchWikiSearch() { 104 104 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 105 - return handleXWikiSearch(this.searchText); 103 + return handleXWikiSearch(this.searchText, this.offset, this.nb); 106 106 } 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 - }); 108 + fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); 114 114 } else { 115 115 resolve([]); 116 116 } ... ... @@ -137,6 +137,8 @@ 137 137 <div> 138 138 <div> 139 139 <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 135 + <input @change="${this.setNb}"" type="text" value="${this.nb}" /> 136 + <input @change="${this.setOffset}"" type="text" value="${this.offset}" /> 140 140 <button @click="${() => this.handleSearch(true)}">Search</button> 141 141 </div> 142 142 <div> ... ... @@ -153,30 +153,21 @@ 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 -</div> 167 167 ` 168 168 } 169 169 } 170 170 customElements.define('clb-unified-search', UnifiedSearch); 171 171 172 - function handleXWikiSearch(searchString) { 158 + function handleXWikiSearch(searchString, offset, nb) { 173 173 return new Promise((resolve) => { 174 174 require(['jquery'], function($) { 175 175 const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 176 176 //contextSearchButton.addEventListener('click', function() { 177 - $. post(solrServiceURL, {163 + $.get(solrServiceURL, { 178 178 outputSyntax: 'plain', 179 179 media: 'json', 166 + nb: nb, 167 + offset: offset, 180 180 query: [ 181 181 'q="__INPUT__"~100', 182 182 'fq=type:DOCUMENT', ... ... @@ -190,5 +190,4 @@ 190 190 } 191 191 }); 192 192 </script> 193 -<clb-unified-search></clb-unified-search> 194 -{{/html}} 181 +<clb-unified-search></clb-unified-search>{{/html}}