Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,5 @@
1		-
2		-{{html clean="false"}}<!--
	1	+{{html clean="false"}}
	2	+<!--
3	3	!!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4	4	!!! Many optimisations can be done !!!
5	5	-->
...	...	@@ -8,11 +8,20 @@
8	8	window.addEventListener('DOMContentLoaded', function() {
9	9
10	10	class UnifiedSearch extends LitElement {
	11	+ /*
11	11	static properties = {
12		- results: { type: Array },
13		- resultsCache: { type: Array },
14		- collabFiltersResults: { type: Array}
	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 },
15	15	}
	21	+ */
	22	+ static properties = {
	23	+ results: { type: Array }
	24	+ }
16	16	static styles = css`
17	17	:host > div {
18	18	padding-bottom: 4em;
...	...	@@ -39,12 +39,7 @@
39	39	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
40	40	this.results = [];
41	41	this.resultsCache = [];
42		- this.offset = 0;
43		- this.nb = 10;
44	44	}
45		- firstUpdated() {
46		- this.renderRoot.getElementById('searchInput').focus();
47		- }
48	48	toggleRoleFilter(roleName) {
49	49	if(this.rolesFilter.indexOf(roleName) === -1) {
50	50	this.rolesFilter.push(roleName);
...	...	@@ -58,12 +58,6 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- setOffset(e) {
62		- this.offset = e.target.value;
63		- }
64		- setNb(e) {
65		- this.nb = e.target.value;
66		- }
67	67	handleSearch(textSearch) {
68	68	if(this.searchText !== "" || textSearch) {
69	69	if(this.searchText !== this.prevSearchText) {
...	...	@@ -96,12 +96,12 @@
96	96	}
97	97	fetchWikiSearch() {
98	98	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
99		- return handleXWikiSearch(this.searchText, this.offset, this.nb);
	97	+ return handleXWikiSearch(this.searchText);
100	100	}
101	101	fetchFilterSearch() {
102	102	return new Promise((resolve) => {
103	103	if(this.hasActiveFilters()) {
104		- fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	102	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
105	105	} else {
106	106	resolve([]);
107	107	}
...	...	@@ -127,9 +127,7 @@
127	127	return html`
128	128	<div>
129	129	<div>
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}" />
	128	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
133	133	<button @click="${() => this.handleSearch(true)}">Search</button>
134	134	</div>
135	135	<div>
...	...	@@ -146,6 +146,7 @@
146	146	</div>
147	147	`)}
148	148	</div>
	145	+</div>
149	149	`
150	150	}
151	151	}
...	...	@@ -156,11 +156,9 @@
156	156	require(['jquery'], function($) {
157	157	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
158	158	//contextSearchButton.addEventListener('click', function() {
159		- $.get(solrServiceURL, {
	156	+ $.post(solrServiceURL, {
160	160	outputSyntax: 'plain',
161	161	media: 'json',
162		- nb:100,
163		- offset:10,
164	164	query: [
165	165	'q="__INPUT__"~100',
166	166	'fq=type:DOCUMENT',
...	...	@@ -174,4 +174,7 @@
174	174	}
175	175	});
176	176	</script>
177		-<clb-unified-search></clb-unified-search>{{/html}}
	172	+
	173	+<clb-unified-search></clb-unified-search>
	174	+
	175	+{{/html}}