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 - 2 - {{html clean="false"}}<!--1 +{{html clean="false"}} 2 +<!-- 3 3 !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 4 !!! Many optimisations can be done !!! 5 5 --> ... ... @@ -27,6 +27,16 @@ 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 ul { 37 + list-style-type: none; 38 + padding: 0; 39 + } 30 30 `; 31 31 constructor() { 32 32 super(); ... ... @@ -39,8 +39,7 @@ 39 39 this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 40 40 this.results = []; 41 41 this.resultsCache = []; 42 - this.offset = 0; 43 - this.nb = 10; 52 + this.collabFiltersResults = []; 44 44 } 45 45 firstUpdated() { 46 46 this.renderRoot.getElementById('searchInput').focus(); ... ... @@ -58,15 +58,9 @@ 58 58 setSearchText(e) { 59 59 this.searchText = e.target.value; 60 60 } 61 - setOffset(e) { 62 - this.offset = e.target.value; 63 - } 64 - setNb(e) { 65 - this.nb = e.target.value; 66 - } 67 67 handleSearch(textSearch) { 68 68 if(this.searchText !== "" || textSearch) { 69 - //if(this.searchText !== this.prevSearchText) {72 + if(this.searchText !== this.prevSearchText) { 70 70 this.clearResults(); 71 71 this.prevSearchText = this.searchText; 72 72 this.fetchWikiSearch().then(results => { ... ... @@ -77,12 +77,11 @@ 77 77 this.results = results; 78 78 } 79 79 }) 80 - /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {83 + } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 81 81 this.fetchFilterSearch().then(this.filterResults) 82 82 } else { 83 83 this.results = this.resultsCache; 84 84 } 85 - */ 86 86 } else { 87 87 this.clearResults(); 88 88 console.log("no search text, should return filter search results if any"); ... ... @@ -97,12 +97,15 @@ 97 97 } 98 98 fetchWikiSearch() { 99 99 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 100 - return handleXWikiSearch(this.searchText , this.offset, this.nb);102 + return handleXWikiSearch(this.searchText); 101 101 } 102 102 fetchFilterSearch() { 103 103 return new Promise((resolve) => { 104 104 if(this.hasActiveFilters()) { 105 - fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res)); 107 + fetch(this.filterUrl).then(res => res.json()).then((res) => { 108 + this.collabFiltersResults = res; 109 + resolve(res); 110 + }); 106 106 } else { 107 107 resolve([]); 108 108 } ... ... @@ -129,8 +129,6 @@ 129 129 <div> 130 130 <div> 131 131 <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 132 - <input @change="${this.setNb}"" type="text" value="${this.nb}" /> 133 - <input @change="${this.setOffset}"" type="text" value="${this.offset}" /> 134 134 <button @click="${() => this.handleSearch(true)}">Search</button> 135 135 </div> 136 136 <div> ... ... @@ -147,21 +147,30 @@ 147 147 </div> 148 148 `)} 149 149 </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> 163 +</div> 150 150 ` 151 151 } 152 152 } 153 153 customElements.define('clb-unified-search', UnifiedSearch); 154 154 155 - function handleXWikiSearch(searchString , offset, nb) {169 + function handleXWikiSearch(searchString) { 156 156 return new Promise((resolve) => { 157 157 require(['jquery'], function($) { 158 158 const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 159 159 //contextSearchButton.addEventListener('click', function() { 160 - $. get(solrServiceURL, {174 + $.post(solrServiceURL, { 161 161 outputSyntax: 'plain', 162 162 media: 'json', 163 - nb: nb, 164 - offset: offset, 165 165 query: [ 166 166 'q="__INPUT__"~100', 167 167 'fq=type:DOCUMENT', ... ... @@ -175,4 +175,5 @@ 175 175 } 176 176 }); 177 177 </script> 178 -<clb-unified-search></clb-unified-search>{{/html}} 190 +<clb-unified-search></clb-unified-search> 191 +{{/html}}