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	-->
...	...	@@ -27,12 +27,6 @@
27	27	a {
28	28	color: var(--color-brand-primary, blue);
29	29	}
30		- .rawResults {
31		- width: 100%;
32		- display: flex;
33		- font-size: 12px;
34		- margin-top: 2em;
35		- }
36	36	`;
37	37	constructor() {
38	38	super();
...	...	@@ -45,6 +45,8 @@
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	}
49	49	firstUpdated() {
50	50	this.renderRoot.getElementById('searchInput').focus();
...	...	@@ -62,9 +62,15 @@
62	62	setSearchText(e) {
63	63	this.searchText = e.target.value;
64	64	}
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
65	65	handleSearch(textSearch) {
66	66	if(this.searchText !== "" || textSearch) {
67		- if(this.searchText !== this.prevSearchText) {
	69	+ // if(this.searchText !== this.prevSearchText) {
68	68	this.clearResults();
69	69	this.prevSearchText = this.searchText;
70	70	this.fetchWikiSearch().then(results => {
...	...	@@ -75,11 +75,12 @@
75	75	this.results = results;
76	76	}
77	77	})
78		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	80	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
79	79	this.fetchFilterSearch().then(this.filterResults)
80	80	} else {
81	81	this.results = this.resultsCache;
82	82	}
	85	+ */
83	83	} else {
84	84	this.clearResults();
85	85	console.log("no search text, should return filter search results if any");
...	...	@@ -94,15 +94,12 @@
94	94	}
95	95	fetchWikiSearch() {
96	96	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
97		- return handleXWikiSearch(this.searchText);
	100	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
98	98	}
99	99	fetchFilterSearch() {
100	100	return new Promise((resolve) => {
101	101	if(this.hasActiveFilters()) {
102		- fetch(this.filterUrl).then(res => res.json()).then((res) => {
103		- this.collabFiltersResults = res;
104		- resolve(res);
105		- });
	105	+ 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}" />
	132	+ <input @change="${this.setNb}"" type="text" value="${this.nb}" />
	133	+ <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,30 +145,21 @@
145	145	</div>
146	146	`)}
147	147	</div>
148		- <div class="rawResults">
149		- <div>
150		- <strong>XWiki Search Results</strong>
151		- <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre>
152		- </div>
153		- <div>
154		- <strong>Collab Search Results (Filters)</strong>
155		- <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre>
156		- </div>
157		- </div>
158		-</div>
159	159	`
160	160	}
161	161	}
162	162	customElements.define('clb-unified-search', UnifiedSearch);
163	163
164		- function handleXWikiSearch(searchString) {
	155	+ function handleXWikiSearch(searchString, offset, nb) {
165	165	return new Promise((resolve) => {
166	166	require(['jquery'], function($) {
167	167	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
168	168	//contextSearchButton.addEventListener('click', function() {
169		- $.post(solrServiceURL, {
	160	+ $.get(solrServiceURL, {
170	170	outputSyntax: 'plain',
171	171	media: 'json',
	163	+ nb: nb,
	164	+ offset: offset,
172	172	query: [
173	173	'q="__INPUT__"~100',
174	174	'fq=type:DOCUMENT',
...	...	@@ -182,5 +182,4 @@
182	182	}
183	183	});
184	184	</script>
185		-<clb-unified-search></clb-unified-search>
186		-{{/html}}
	178	+<clb-unified-search></clb-unified-search>{{/html}}