Changes for page Context Search

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -18,6 +18,9 @@
18	18	privateFilter: { type: Boolean },
19	19	}
20	20	*/
	21	+ static properties = {
	22	+ results: { type: Array }
	23	+ }
21	21	constructor() {
22	22	super();
23	23	this.searchText = "";
...	...	@@ -26,6 +26,7 @@
26	26	this.viewer = false;
27	27	this.rolesFilter = [];
28	28	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
	32	+ this.results = [];
29	29	}
30	30	toggleRoleFilter(roleName) {
31	31	if(this.rolesFilter.indexOf(roleName) == -1) {
...	...	@@ -41,7 +41,14 @@
41	41	}
42	42	handleSearch() {
43	43	console.log(this.searchText);
	48	+ if(this.searchText !== "") {
	49	+ this.fetchWikiSearch();
	50	+ }
44	44	}
	52	+ fetchWikiSearch() {
	53	+ // request should be built from component, not from "external" dependency. Leave it here like this for POC.
	54	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
	55	+ }
45	45	buildFilter() {
46	46	//https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
47	47	}
...	...	@@ -57,6 +57,15 @@
57	57	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
58	58	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
59	59	</div>
	71	+ <div>
	72	+ ${this.results.map(result => html`
	73	+ <div>
	74	+ <a href="#">${result.title_}</a>
	75	+ <div>${result.space}</div>
	76	+ <div>${result.doccontent_.substring(0, 150)}
	77	+ </div>
	78	+ `)}
	79	+ </div>
60	60	</div>
61	61	`
62	62	}
...	...	@@ -63,30 +63,22 @@
63	63	}
64	64	customElements.define('clb-unified-search', UnifiedSearch);
65	65
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		- }
89		- });
	86	+ function handleXWikiSearch(searchString) {
	87	+ return new Promise((resolve) => {
	88	+ require(['jquery'], function($) {
	89	+ const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	90	+ //contextSearchButton.addEventListener('click', function() {
	91	+ $.post(solrServiceURL, {
	92	+ outputSyntax: 'plain',
	93	+ media: 'json',
	94	+ query: [
	95	+ 'q="__INPUT__"~100',
	96	+ 'fq=type:DOCUMENT',
	97	+ `fq=space:Collabs.*`
	98	+ ].join('\n'),
	99	+ input: searchString
	100	+ }).then(resolve);
	101	+ //});
90	90	});
91	91	});
92	92	}