Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -18,9 +18,6 @@
18	18	privateFilter: { type: Boolean },
19	19	}
20	20	*/
21		- static properties = {
22		- results: { type: Array }
23		- }
24	24	constructor() {
25	25	super();
26	26	this.searchText = "";
...	...	@@ -29,7 +29,6 @@
29	29	this.viewer = false;
30	30	this.rolesFilter = [];
31	31	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
32		- this.results = [];
33	33	}
34	34	toggleRoleFilter(roleName) {
35	35	if(this.rolesFilter.indexOf(roleName) == -1) {
...	...	@@ -45,14 +45,7 @@
45	45	}
46	46	handleSearch() {
47	47	console.log(this.searchText);
48		- if(this.searchText !== "") {
49		- this.fetchWikiSearch();
50		- }
51	51	}
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		- }
56	56	buildFilter() {
57	57	//https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
58	58	}
...	...	@@ -68,15 +68,6 @@
68	68	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
69	69	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
70	70	</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>
80	80	</div>
81	81	`
82	82	}
...	...	@@ -83,22 +83,30 @@
83	83	}
84	84	customElements.define('clb-unified-search', UnifiedSearch);
85	85
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		- //});
	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	+ });
102	102	});
103	103	});
104	104	}