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	-->
...	...	@@ -27,6 +27,15 @@
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	+ .rawResults pre {
	37	+ overflow: scroll;
	38	+ }
30	30	`;
31	31	constructor() {
32	32	super();
...	...	@@ -39,8 +39,6 @@
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	45	firstUpdated() {
46	46	this.renderRoot.getElementById('searchInput').focus();
...	...	@@ -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,15 @@
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);
	100	+ 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));
	105	+ fetch(this.filterUrl).then(res => res.json()).then((res) => {
	106	+ this.collabFiltersResults = res;
	107	+ resolve(res);
	108	+ });
105	105	} else {
106	106	resolve([]);
107	107	}
...	...	@@ -128,8 +128,6 @@
128	128	<div>
129	129	<div>
130	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}" />
133	133	<button @click="${() => this.handleSearch(true)}">Search</button>
134	134	</div>
135	135	<div>
...	...	@@ -146,21 +146,30 @@
146	146	</div>
147	147	`)}
148	148	</div>
	151	+ <div class="rawResults">
	152	+ <div>
	153	+ <strong>XWiki Search Results</strong>
	154	+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
	155	+ </div>
	156	+ <div>
	157	+ <strong>Collab Search Results (Filters)</strong>
	158	+ <pre>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</pre>
	159	+ </div>
	160	+ </div>
	161	+</div>
149	149	`
150	150	}
151	151	}
152	152	customElements.define('clb-unified-search', UnifiedSearch);
153	153
154		- function handleXWikiSearch(searchString, offset, nb) {
	167	+ function handleXWikiSearch(searchString) {
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		- $.get(solrServiceURL, {
	172	+ $.post(solrServiceURL, {
160	160	outputSyntax: 'plain',
161	161	media: 'json',
162		- nb: nb,
163		- offset: offset,
164	164	query: [
165	165	'q="__INPUT__"~100',
166	166	'fq=type:DOCUMENT',
...	...	@@ -174,4 +174,5 @@
174	174	}
175	175	});
176	176	</script>
177		-<clb-unified-search></clb-unified-search>{{/html}}
	188	+<clb-unified-search></clb-unified-search>
	189	+{{/html}}