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	-->
...	...	@@ -39,6 +39,8 @@
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;
42	42	}
43	43	firstUpdated() {
44	44	this.renderRoot.getElementById('searchInput').focus();
...	...	@@ -56,24 +56,31 @@
56	56	setSearchText(e) {
57	57	this.searchText = e.target.value;
58	58	}
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
59	59	handleSearch(textSearch) {
60	60	if(this.searchText !== "" || textSearch) {
61		- if(this.searchText !== this.prevSearchText) {
	69	+ // if(this.searchText !== this.prevSearchText) {
62	62	this.clearResults();
63	63	this.prevSearchText = this.searchText;
64	64	this.fetchWikiSearch().then(results => {
65		- this.resultsCache = results;
	73	+ //this.resultsCache = results;
66	66	if(this.hasActiveFilters()) {
67	67	this.fetchFilterSearch().then(this.filterResults);
68	68	} else {
69		- this.results = results;
	77	+ this.results = results ? results : [];
70	70	}
71	71	})
72		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	80	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
73	73	this.fetchFilterSearch().then(this.filterResults)
74	74	} else {
75	75	this.results = this.resultsCache;
76	76	}
	85	+ */
77	77	} else {
78	78	this.clearResults();
79	79	console.log("no search text, should return filter search results if any");
...	...	@@ -88,15 +88,12 @@
88	88	}
89	89	fetchWikiSearch() {
90	90	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
91		- return handleXWikiSearch(this.searchText);
	100	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
92	92	}
93	93	fetchFilterSearch() {
94	94	return new Promise((resolve) => {
95	95	if(this.hasActiveFilters()) {
96		- fetch(this.filterUrl).then(res => res.json()).then((res) => {
97		- this.collabFiltersResults = res;
98		- resolve(res);
99		- });
	105	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
100	100	} else {
101	101	resolve([]);
102	102	}
...	...	@@ -123,6 +123,8 @@
123	123	<div>
124	124	<div>
125	125	<input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	132	+ <input @change="${this.setNb}"" type="text" value="${this.nb}" />
	133	+ <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
126	126	<button @click="${() => this.handleSearch(true)}">Search</button>
127	127	</div>
128	128	<div>
...	...	@@ -139,30 +139,21 @@
139	139	</div>
140	140	`)}
141	141	</div>
142		- <div class="rawResults">
143		- <div>
144		- <strong>XWiki Search Results</strong>
145		- <pre>${this.resultsCache}</pre>
146		- </div>
147		- <div>
148		- <strong>Collab Search Results (Filters)</strong>
149		- <pre>${this.collabFiltersResults}</pre>
150		- </div>
151		- </div>
152		-</div>
153	153	`
154	154	}
155	155	}
156	156	customElements.define('clb-unified-search', UnifiedSearch);
157	157
158		- function handleXWikiSearch(searchString) {
	155	+ function handleXWikiSearch(searchString, offset, nb) {
159	159	return new Promise((resolve) => {
160	160	require(['jquery'], function($) {
161	161	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
162	162	//contextSearchButton.addEventListener('click', function() {
163		- $.post(solrServiceURL, {
	160	+ $.get(solrServiceURL, {
164	164	outputSyntax: 'plain',
165	165	media: 'json',
	163	+ nb: nb,
	164	+ offset: offset,
166	166	query: [
167	167	'q="__INPUT__"~100',
168	168	'fq=type:DOCUMENT',
...	...	@@ -176,5 +176,4 @@
176	176	}
177	177	});
178	178	</script>
179		-<clb-unified-search></clb-unified-search>
180		-{{/html}}
	178	+<clb-unified-search></clb-unified-search>{{/html}}