Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,5 @@
1		-{{html clean="false"}}
2		-<!--
	1	+
	2	+{{html clean="false"}}<!--
3	3	!!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4	4	!!! Many optimisations can be done !!!
5	5	-->
...	...	@@ -8,20 +8,11 @@
8	8	window.addEventListener('DOMContentLoaded', function() {
9	9
10	10	class UnifiedSearch extends LitElement {
11		- /*
12	12	static properties = {
13		- searchText: { type: String },
14		- favoritesFilter: { type: Boolean },
15		- administratorFilter: { type: Boolean },
16		- editorFilter: { type: Boolean },
17		- viewerFilter: { type: Boolean },
18		- publicFilter: { type: Boolean },
19		- privateFilter: { type: Boolean },
	12	+ results: { type: Array },
	13	+ resultsCache: { type: Array },
	14	+ collabFiltersResults: { type: Array}
20	20	}
21		- */
22		- static properties = {
23		- results: { type: Array }
24		- }
25	25	static styles = css`
26	26	:host > div {
27	27	padding-bottom: 4em;
...	...	@@ -48,6 +48,8 @@
48	48	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
49	49	this.results = [];
50	50	this.resultsCache = [];
	42	+ this.offset = 0;
	43	+ this.nb = 10;
51	51	}
52	52	firstUpdated() {
53	53	this.renderRoot.getElementById('searchInput').focus();
...	...	@@ -65,6 +65,12 @@
65	65	setSearchText(e) {
66	66	this.searchText = e.target.value;
67	67	}
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
68	68	handleSearch(textSearch) {
69	69	if(this.searchText !== "" || textSearch) {
70	70	if(this.searchText !== this.prevSearchText) {
...	...	@@ -97,12 +97,12 @@
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);
	99	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
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(resolve);
	104	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
106	106	} else {
107	107	resolve([]);
108	108	}
...	...	@@ -129,6 +129,8 @@
129	129	<div>
130	130	<div>
131	131	<input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	131	+ <input @change="${this.setNb}"" type="text" value="${this.nb}" />
	132	+ <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
132	132	<button @click="${() => this.handleSearch(true)}">Search</button>
133	133	</div>
134	134	<div>
...	...	@@ -145,20 +145,21 @@
145	145	</div>
146	146	`)}
147	147	</div>
148		-</div>
149	149	`
150	150	}
151	151	}
152	152	customElements.define('clb-unified-search', UnifiedSearch);
153	153
154		- function handleXWikiSearch(searchString) {
	154	+ function handleXWikiSearch(searchString, offset, nb) {
155	155	return new Promise((resolve) => {
156	156	require(['jquery'], function($) {
157	157	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
158	158	//contextSearchButton.addEventListener('click', function() {
159		- $.post(solrServiceURL, {
	159	+ $.get(solrServiceURL, {
160	160	outputSyntax: 'plain',
161	161	media: 'json',
	162	+ nb: nb,
	163	+ offset: offset,
162	162	query: [
163	163	'q="__INPUT__"~100',
164	164	'fq=type:DOCUMENT',
...	...	@@ -172,7 +172,4 @@
172	172	}
173	173	});
174	174	</script>
175		-
176		-<clb-unified-search></clb-unified-search>
177		-
178		-{{/html}}
	177	+<clb-unified-search></clb-unified-search>{{/html}}