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,15 +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		- .rawResults pre {
37		- overflow: scroll;
38		- }
39	39	`;
40	40	constructor() {
41	41	super();
...	...	@@ -48,7 +48,8 @@
48	48	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
49	49	this.results = [];
50	50	this.resultsCache = [];
51		- this.collabFiltersResults = [];
	42	+ this.offset = 0;
	43	+ this.nb = 10;
52	52	}
53	53	firstUpdated() {
54	54	this.renderRoot.getElementById('searchInput').focus();
...	...	@@ -66,24 +66,31 @@
66	66	setSearchText(e) {
67	67	this.searchText = e.target.value;
68	68	}
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
69	69	handleSearch(textSearch) {
70	70	if(this.searchText !== "" || textSearch) {
71		- if(this.searchText !== this.prevSearchText) {
	69	+ // if(this.searchText !== this.prevSearchText) {
72	72	this.clearResults();
73	73	this.prevSearchText = this.searchText;
74	74	this.fetchWikiSearch().then(results => {
75		- this.resultsCache = results;
	73	+ //this.resultsCache = results;
76	76	if(this.hasActiveFilters()) {
77	77	this.fetchFilterSearch().then(this.filterResults);
78	78	} else {
79		- this.results = results;
	77	+ this.results = results ? results || [];
80	80	}
81	81	})
82		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	80	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
83	83	this.fetchFilterSearch().then(this.filterResults)
84	84	} else {
85	85	this.results = this.resultsCache;
86	86	}
	85	+ */
87	87	} else {
88	88	this.clearResults();
89	89	console.log("no search text, should return filter search results if any");
...	...	@@ -98,15 +98,12 @@
98	98	}
99	99	fetchWikiSearch() {
100	100	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
101		- return handleXWikiSearch(this.searchText);
	100	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
102	102	}
103	103	fetchFilterSearch() {
104	104	return new Promise((resolve) => {
105	105	if(this.hasActiveFilters()) {
106		- fetch(this.filterUrl).then(res => res.json()).then((res) => {
107		- this.collabFiltersResults = res;
108		- resolve(res);
109		- });
	105	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
110	110	} else {
111	111	resolve([]);
112	112	}
...	...	@@ -133,6 +133,8 @@
133	133	<div>
134	134	<div>
135	135	<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}" />
136	136	<button @click="${() => this.handleSearch(true)}">Search</button>
137	137	</div>
138	138	<div>
...	...	@@ -149,30 +149,21 @@
149	149	</div>
150	150	`)}
151	151	</div>
152		- <div class="rawResults">
153		- <div>
154		- <strong>XWiki Search Results</strong>
155		- <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
156		- </div>
157		- <div>
158		- <strong>Collab Search Results (Filters)</strong>
159		- <pre>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</pre>
160		- </div>
161		- </div>
162		-</div>
163	163	`
164	164	}
165	165	}
166	166	customElements.define('clb-unified-search', UnifiedSearch);
167	167
168		- function handleXWikiSearch(searchString) {
	155	+ function handleXWikiSearch(searchString, offset, nb) {
169	169	return new Promise((resolve) => {
170	170	require(['jquery'], function($) {
171	171	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
172	172	//contextSearchButton.addEventListener('click', function() {
173		- $.post(solrServiceURL, {
	160	+ $.get(solrServiceURL, {
174	174	outputSyntax: 'plain',
175	175	media: 'json',
	163	+ nb: nb,
	164	+ offset: offset,
176	176	query: [
177	177	'q="__INPUT__"~100',
178	178	'fq=type:DOCUMENT',
...	...	@@ -186,5 +186,4 @@
186	186	}
187	187	});
188	188	</script>
189		-<clb-unified-search></clb-unified-search>
190		-{{/html}}
	178	+<clb-unified-search></clb-unified-search>{{/html}}