| ... |
... |
@@ -42,10 +42,6 @@ |
| 42 |
42 |
handleSearch() { |
| 43 |
43 |
console.log(this.searchText); |
| 44 |
44 |
} |
| 45 |
|
- fetchWikiSearch() { |
| 46 |
|
- // request should be built from component, not from "external" dependency. Leave it here like this for POC. |
| 47 |
|
- handleXWikiSearch(this.searchText).then(results => console.log(results)); |
| 48 |
|
- } |
| 49 |
49 |
buildFilter() { |
| 50 |
50 |
//https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= |
| 51 |
51 |
} |
| ... |
... |
@@ -67,21 +67,29 @@ |
| 67 |
67 |
} |
| 68 |
68 |
customElements.define('clb-unified-search', UnifiedSearch); |
| 69 |
69 |
|
| 70 |
|
- function handleXWikiSearch(searchString) { |
| 71 |
|
- return new Promise((resolve) => { |
| 72 |
|
- require(['jquery'], function($) { |
| 73 |
|
- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
| 74 |
|
- contextSearchButton.addEventListener('click', function() { |
| 75 |
|
- $.post(solrServiceURL, { |
| 76 |
|
- outputSyntax: 'plain', |
| 77 |
|
- media: 'json', |
| 78 |
|
- query: [ |
| 79 |
|
- 'q="__INPUT__"~100', |
| 80 |
|
- 'fq=type:DOCUMENT', |
| 81 |
|
- `fq=space:Collabs.*` |
| 82 |
|
- ].join('\n'), |
| 83 |
|
- input: searchString |
| 84 |
|
- }).then(resolve); |
|
66 |
+ function handleXWikiSearch(space, callback) { |
|
67 |
+ require(['jquery'], function($) { |
|
68 |
+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
|
69 |
+ const contextSearchButton = document.getElementById("context-search-button"); |
|
70 |
+ const xwikiSpace = space ? `.${space}` : ''; |
|
71 |
+ contextSearchButton.addEventListener('click', function() { |
|
72 |
+ $.post(solrServiceURL, { |
|
73 |
+ outputSyntax: 'plain', |
|
74 |
+ media: 'json', |
|
75 |
+ query: [ |
|
76 |
+ 'q="__INPUT__"~100', |
|
77 |
+ 'fq=type:DOCUMENT', |
|
78 |
+ `fq=space:Collabs${xwikiSpace}.*` |
|
79 |
+ ].join('\n'), |
|
80 |
+ input: $('#context-search-text').val() |
|
81 |
+ }).then(res => { |
|
82 |
+ if(callback) { |
|
83 |
+ callback(res).then(results => { |
|
84 |
+ contextSearchResponse.innerText = JSON.stringify(results, null, 2); |
|
85 |
+ }) |
|
86 |
+ } else { |
|
87 |
+ contextSearchResponse.innerText = JSON.stringify(res, null, 2); |
|
88 |
+ } |
| 85 |
85 |
}); |
| 86 |
86 |
}); |
| 87 |
87 |
}); |