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,21 +8,15 @@
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`
	17	+ :host > div {
	18	+ padding-bottom: 4em;
	19	+ }
26	26	.result {
27	27	margin-top: 1em;
28	28	}
...	...	@@ -45,7 +45,12 @@
45	45	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
46	46	this.results = [];
47	47	this.resultsCache = [];
	42	+ this.offset = 0;
	43	+ this.nb = 10;
48	48	}
	45	+ firstUpdated() {
	46	+ this.renderRoot.getElementById('searchInput').focus();
	47	+ }
49	49	toggleRoleFilter(roleName) {
50	50	if(this.rolesFilter.indexOf(roleName) === -1) {
51	51	this.rolesFilter.push(roleName);
...	...	@@ -59,6 +59,12 @@
59	59	setSearchText(e) {
60	60	this.searchText = e.target.value;
61	61	}
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
62	62	handleSearch(textSearch) {
63	63	if(this.searchText !== "" || textSearch) {
64	64	if(this.searchText !== this.prevSearchText) {
...	...	@@ -91,12 +91,12 @@
91	91	}
92	92	fetchWikiSearch() {
93	93	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
94		- return handleXWikiSearch(this.searchText);
	99	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
95	95	}
96	96	fetchFilterSearch() {
97	97	return new Promise((resolve) => {
98	98	if(this.hasActiveFilters()) {
99		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	104	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
100	100	} else {
101	101	resolve([]);
102	102	}
...	...	@@ -113,11 +113,18 @@
113	113	getLink(xwikiDocSpace) {
114	114	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
115	115	}
	121	+ handleKeyPress(e) {
	122	+ if (e.keyCode === 13) {
	123	+ this.handleSearch(true);
	124	+ }
	125	+ }
116	116	render() {
117	117	return html`
118	118	<div>
119	119	<div>
120		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	130	+ <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}" />
121	121	<button @click="${() => this.handleSearch(true)}">Search</button>
122	122	</div>
123	123	<div>
...	...	@@ -134,7 +134,6 @@
134	134	</div>
135	135	`)}
136	136	</div>
137		-</div>
138	138	`
139	139	}
140	140	}
...	...	@@ -145,9 +145,11 @@
145	145	require(['jquery'], function($) {
146	146	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
147	147	//contextSearchButton.addEventListener('click', function() {
148		- $.post(solrServiceURL, {
	159	+ $.get(solrServiceURL, {
149	149	outputSyntax: 'plain',
150	150	media: 'json',
	162	+ nb:100,
	163	+ offset:10,
151	151	query: [
152	152	'q="__INPUT__"~100',
153	153	'fq=type:DOCUMENT',
...	...	@@ -161,7 +161,4 @@
161	161	}
162	162	});
163	163	</script>
164		-
165		-<clb-unified-search></clb-unified-search>
166		-
167		-{{/html}}
	177	+<clb-unified-search></clb-unified-search>{{/html}}