Changes for page Context Search

Summary

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

Details

Page properties

Content

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