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